Merge of build trunk.
[m6w6/libmemcached] / .bzrignore
index 8432fe194ba45d4a528bb6aad1961ede81733500..f8c1a8e9331ae4876413dfef7328a5bfd9845635 100644 (file)
@@ -54,11 +54,9 @@ config/compile
 config/config.guess
 config/config.sub
 config/depcomp
-config/install-sh
 config/ltmain.sh
 config/missing
 config/pandora_vc_revinfo
-config/plugin.ac
 config/top.h
 configure
 configure.scan
@@ -72,9 +70,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 +83,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 +129,14 @@ tests/memstat
 tests/memcat
 clients/memexist
 tests/memexist
+libmemcached/configure.h
+clients/memtouch
+tests/memtouch
+libmemcached-1.2/configure.h
+tests/libmemcached-1.0/internals
+tests/libmemcached-1.0/sasl
+tests/libmemcached-1.0/testapp
+libmemcached-2.0/configure.h
+libmemcached-1.0/t/c_test
+libmemcached-1.0/t/c_sasl_test
+libmemcached-1.0/t/cc_test