MErge

[m6w6/libmemcached] / .bzrignore

diff --git a/.bzrignore b/.bzrignore
index 3a6e517ac449971e835d39648434e163996baed6..b9bd9e5342a54626b6e98c3c4085599e83ce7366 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
@@ -86,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
@@ -127,3 +122,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