mirror/phpredis
1
0
Fork 0
mirror of https://github.com/phpredis/phpredis.git synced 2026-06-19 07:35:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,419 Commits 21 Branches 126 Tags
develop
Commit Graph

6 Commits

Author SHA1 Message Date
Anatol Belski 4d2533706a Merge remote-tracking branch 'vostok4/master' 
Conflicts:
	CREDITS
	README.markdown
	config.w32
	library.c
	library.h
	package.xml
	redis.c
	redis_array.c
	redis_array.h
	redis_array_impl.c
	redis_array_impl.h
	tests/TestRedis.php
 2014-07-01 16:45:09 +02:00
Anatol Belski 3880c9eb9e fix CREDITS for resource compilation to work 
see also CREDITS in other exts for the correct format
 2014-07-01 12:37:11 +02:00
vostok4 9c12c40a66 Merge nicolasff:b9a16b5ad5 in, fixing for Win32 
Now we should be up to master with upstream for an easier merge.
 2014-04-09 11:14:45 +02:00
michael-grunder 2fc8e78711 Add my email to CREDITS file 2014-03-19 08:19:11 -07:00
vostok4 5655f0574e Last fix for win32 compiles 
This fixes the rc command using <> characters which breaks it.
 2013-10-16 11:39:51 +02:00
Nicolas Favre-Felix 637b1c40f5 Initial commit 2009-11-13 11:39:33 +01:00