git.saurik.com Git - redis.git/commit - src/redis.c

]> git.saurik.com Git - redis.git/commit - src/redis.c

projects / redis.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 73abd0a 4794d88)

author	antirez <antirez@gmail.com>
	Thu, 28 Oct 2010 20:59:47 +0000 (22:59 +0200)
committer	antirez <antirez@gmail.com>
	Thu, 28 Oct 2010 20:59:47 +0000 (22:59 +0200)
commit	21dbc6499a538af07f52a41742cf1683f3fc9c23
tree	8e0d8a598ac1faa4bc50c0552b3821821376147e	tree \| snapshot
parent	73abd0a9d2a956af34351c59e15eba603ab29c6e	commit \| diff
parent	4794d88f15ee4e4175e712b411bb7cebee7aff09	commit \| diff

merge conflict resolved

src/Makefile	diff1 \|	diff2 \|	blob \| history
src/aof.c	diff1 \|	diff2 \|	blob \| history
src/config.c	diff1 \|	diff2 \|	blob \| history
src/redis.c	diff1 \|	diff2 \|	blob \| history
src/redis.h	diff1 \|	diff2 \|	blob \| history
src/t_zset.c	diff1 \|	diff2 \|	blob \| history

Redis += OpenLDAP MDB