]> git.saurik.com Git - redis.git/commitdiff
Merge remote branch 'jonahharris/syslog'
authorantirez <antirez@gmail.com>
Tue, 14 Dec 2010 16:53:28 +0000 (17:53 +0100)
committerantirez <antirez@gmail.com>
Tue, 14 Dec 2010 16:53:28 +0000 (17:53 +0100)
1  2 
src/redis.c
src/redis.h

diff --cc src/redis.c
Simple merge
diff --cc src/redis.h
Simple merge