]> git.saurik.com Git - redis.git/commitdiff
projects / redis.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fdfb02e 30dd89b)
Merge branch 'master' into integration
authorPieter Noordhuis <pcnoordhuis@gmail.com>
Wed, 19 May 2010 12:53:57 +0000 (14:53 +0200)
committerPieter Noordhuis <pcnoordhuis@gmail.com>
Wed, 19 May 2010 12:53:57 +0000 (14:53 +0200)
1  2 
redis.c patch | diff1 | diff2 | blob | history

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