From: antirez <antirez@gmail.com>
Date: Tue, 14 Dec 2010 16:42:46 +0000 (+0100)
Subject: Merge branch 'master' of github.com:antirez/redis
X-Git-Url: https://git.saurik.com/redis.git/commitdiff_plain/603e616bf4e09cdbbfeaf77a5e2a02876c229c35?ds=inline

Merge branch 'master' of github.com:antirez/redis
---

603e616bf4e09cdbbfeaf77a5e2a02876c229c35
diff --cc src/redis.h
index 6e2112a0,860e77a1..4a6af106
--- a/src/redis.h
+++ b/src/redis.h
@@@ -970,7 -973,9 +977,8 @@@ void execCommand(redisClient *c)
  void discardCommand(redisClient *c);
  void blpopCommand(redisClient *c);
  void brpopCommand(redisClient *c);
+ void brpoplpushCommand(redisClient *c);
  void appendCommand(redisClient *c);
 -void substrCommand(redisClient *c);
  void strlenCommand(redisClient *c);
  void zrankCommand(redisClient *c);
  void zrevrankCommand(redisClient *c);