]> git.saurik.com Git - redis.git/commitdiff
projects / redis.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 169dd6b a89b701)
Merge branch 'master' into smallkeys
authorantirez <antirez@gmail.com>
Wed, 2 Jun 2010 13:19:50 +0000 (15:19 +0200)
committerantirez <antirez@gmail.com>
Wed, 2 Jun 2010 13:19:50 +0000 (15:19 +0200)
1  2 
redis.c patch | diff1 | diff2 | blob | history

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