Merge

[m6w6/libmemcached] / .bzrignore

diff --git a/.bzrignore b/.bzrignore
index 8432fe194ba45d4a528bb6aad1961ede81733500..b9bd9e5342a54626b6e98c3c4085599e83ce7366 100644 (file)
--- a/.bzrignore
+++ b/.bzrignore
@@ -72,9 +72,9 @@ docs/html/
 docs/linkcheck/
 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
@@ -85,11 +85,7 @@ libtest/unittest
 libtest/version.h
 libtest/wait
 libtool
-libtool.m4
-ltoptions.m4
-ltsugar.m4
-ltversion.m4
-lt~obsolete.m4
+m4/libtool.m4
 m4/libtool.m4 
 m4/ltoptions.m4
 m4/ltsugar.m4
@@ -135,3 +131,6 @@ tests/memstat
 tests/memcat
 clients/memexist
 tests/memexist
+libmemcached/configure.h
+clients/memtouch
+tests/memtouch