Merge working tree with build tree.

[m6w6/libmemcached] / .bzrignore

diff --git a/.bzrignore b/.bzrignore
index b9bd9e5342a54626b6e98c3c4085599e83ce7366..10a4347121d30c93d5e68009ee707550611ec4df 100644 (file)
--- a/.bzrignore
+++ b/.bzrignore
@@ -39,12 +39,14 @@ clients/memcat
 clients/memcp
 clients/memdump
 clients/memerror
+clients/memexist
 clients/memflush
 clients/memparse
 clients/memping
 clients/memrm
 clients/memslap
 clients/memstat
+clients/memtouch
 config.h
 config.h.in
 config.in
@@ -58,7 +60,6 @@ config/install-sh
 config/ltmain.sh
 config/missing
 config/pandora_vc_revinfo
-config/plugin.ac
 config/top.h
 configure
 configure.scan
@@ -73,8 +74,14 @@ docs/linkcheck/
 docs/text
 example/memcached_light
 libhashkit-1.0/configure.h
-libmemcached-?.??/
 libmemcached-1.0/configure.h
+libmemcached-1.0/t/c_sasl_test
+libmemcached-1.0/t/c_test
+libmemcached-1.0/t/cc_test
+libmemcached-1.2/configure.h
+libmemcached-2.0/configure.h
+libmemcached-?.??/
+libmemcached/configure.h
 libmemcached/dtrace_probes.h
 libmemcached/generated_probes.h
 libmemcached/memcached_configure.h
@@ -109,9 +116,21 @@ tests/failure
 tests/hash_plus
 tests/hashplus
 tests/internals
+tests/libmemcached-1.0/internals
+tests/libmemcached-1.0/sasl
+tests/libmemcached-1.0/testapp
 tests/memcapable
+tests/memcat
+tests/memcp
+tests/memdump
+tests/memerror
+tests/memexist
+tests/memflush
 tests/memplus
+tests/memrm
 tests/memslap
+tests/memstat
+tests/memtouch
 tests/output.cmp
 tests/sasl
 tests/startservers
@@ -122,15 +141,10 @@ 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
+tests/libmemcached-1.0/testsocket
+example/t/memcached_light
+libtest/abort
+memcached/.git
+memcached/.gitignore
+memcached/memcached
+memcached/memcached.spec