]> git.saurik.com Git - redis.git/commitdiff
projects / redis.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 28ed1f3 4132ad8)
Merge branch 'master' into aof-speedup
authorantirez <antirez@gmail.com>
Thu, 6 May 2010 21:19:46 +0000 (23:19 +0200)
committerantirez <antirez@gmail.com>
Thu, 6 May 2010 21:19:46 +0000 (23:19 +0200)
1  2 
redis.c patch | diff1 | diff2 | blob | history

diff --cc redis.c
Simple merge
Redis += OpenLDAP MDB