Merge from build trunk.
[m6w6/libmemcached] / .bzrignore
index e74d397b7574239133bba14cb9ec27a0767d41f8..f8c1a8e9331ae4876413dfef7328a5bfd9845635 100644 (file)
@@ -68,7 +68,6 @@ docs/doctest/
 docs/doctrees/
 docs/html/
 docs/linkcheck/
-docs/man/*
 docs/text
 example/memcached_light
 libhashkit-1.0/configure.h
@@ -137,3 +136,7 @@ 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