diff options
author | antirez <antirez@gmail.com> | 2011-06-25 12:29:24 +0200 |
---|---|---|
committer | antirez <antirez@gmail.com> | 2011-06-25 12:29:24 +0200 |
commit | 994ed2bc552f4114b1f0c8dd3fd8aefaec6beeae (patch) | |
tree | 16c7f8d3c7f050a5cda04488d48109ee7f02b6fb /Makefile | |
parent | 45ec3243f8205ff8d356a5175026052070211d91 (diff) | |
parent | d5b36c5114659e979fc2e102954ded1e30aacacf (diff) | |
download | redis-994ed2bc552f4114b1f0c8dd3fd8aefaec6beeae.tar.gz |
unstable merge conflicts resolved
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -12,6 +12,7 @@ clean: cd src && $(MAKE) $@ cd deps/hiredis && $(MAKE) $@ cd deps/linenoise && $(MAKE) $@ + cd deps/jemalloc && $(MAKE) distclean cd deps/lua && $(MAKE) $@ $(TARGETS): |