Merge trunk

[m6w6/libmemcached] / .bzrignore

diff --git a/.bzrignore b/.bzrignore
index c28f4fd1ef443fbfcfe8f52303859a4793477511..dbe3e8943e3ec736662fdf864b90187e76e5abcf 100644 (file)
--- a/.bzrignore
+++ b/.bzrignore
@@ -70,12 +70,11 @@ docs/doctest/
 docs/doctrees/
 docs/html/
 docs/linkcheck/
-docs/man/*
 docs/text
 example/memcached_light
-libhashkit/configure.h
+libhashkit-1.0/configure.h
 libmemcached-?.??/
-libmemcached/configure.h
+libmemcached-1.0/configure.h
 libmemcached/dtrace_probes.h
 libmemcached/generated_probes.h
 libmemcached/memcached_configure.h
@@ -110,6 +109,7 @@ tests/atomsmasher
 tests/c_sasl_test
 tests/c_test
 tests/cycle
+tests/failure
 tests/hash_plus
 tests/hashplus
 tests/internals
@@ -126,3 +126,15 @@ tests/testudp
 tests/var/
 tmp_chroot
 unittests/unittests
+tests/memerror
+tests/memcp
+tests/memdump
+tests/memflush
+tests/memrm
+tests/memstat
+tests/memcat
+clients/memexist
+tests/memexist
+libmemcached/configure.h
+clients/memtouch
+tests/memtouch