]> git.saurik.com Git - redis.git/commitdiff
projects / redis.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6531c94 1ad4d31)
Merge branch 'master' into nested-multi
authorantirez <antirez@gmail.com>
Wed, 26 May 2010 15:55:28 +0000 (17:55 +0200)
committerantirez <antirez@gmail.com>
Wed, 26 May 2010 15:55:28 +0000 (17:55 +0200)
1  2 
redis.c patch | diff1 | diff2 | blob | history

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