Alexis Campailla
3895a7d148
Conflicts: src/anet.c src/aof.c src/bitops.c src/config.c src/db.c src/debug.c src/dict.c src/migrate.c src/object.c src/redis.c src/redis.h src/sentinel.c src/t_list.c src/t_set.c src/t_zset.c src/util.c tests/instances.tcl
47 lines
633 B
Plaintext
47 lines
633 B
Plaintext
.*.swp
|
|
*.o
|
|
*.log
|
|
dump.rdb
|
|
redis-benchmark
|
|
redis-check-aof
|
|
redis-check-dump
|
|
redis-cli
|
|
redis-sentinel
|
|
redis-server
|
|
doc-tools
|
|
release
|
|
bin/
|
|
obj/
|
|
Debug/
|
|
Release/
|
|
x64/
|
|
misc/*
|
|
src/release.h
|
|
appendonly.aof
|
|
SHORT_TERM_TODO
|
|
release.h
|
|
src/transfer.sh
|
|
src/configs
|
|
redis.ds
|
|
src/redis.conf
|
|
src/nodes.conf
|
|
deps/lua/src/lua
|
|
deps/lua/src/luac
|
|
deps/lua/src/liblua.a
|
|
.make-*
|
|
.prerequisites
|
|
*.dSYM
|
|
*.user
|
|
*.exe
|
|
*.sdf
|
|
*.suo
|
|
msvs/ReleasePackagingT
|
|
msvs/ipch
|
|
msvs/RedisServer.opensdf
|
|
!msvs/RedisWaInst/bin/*
|
|
!msvs/RedisWaInst/bin/Inst4WA/*
|
|
!msvs/RedisWaInst/bin/RedisPkgBin/*
|
|
msvs/RedisWAInst/src/RedisInstBin/
|
|
msvs/RedisWAInst/src/RedisInstWA/app.config
|
|
|