]> git.saurik.com Git - redis.git/commitdiff
projects / redis.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0e25c0c f4eb4b3)
Merge remote-tracking branch 'origin/2.6' into 2.6
authorantirez <antirez@gmail.com>
Thu, 11 Oct 2012 16:36:18 +0000 (18:36 +0200)
committerantirez <antirez@gmail.com>
Thu, 11 Oct 2012 16:36:18 +0000 (18:36 +0200)
1  2 
src/redis.c patch | diff1 | diff2 | blob | history

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