Merge trunk for LP

[awesomized/libmemcached] / .bzrignore

diff --git a/.bzrignore b/.bzrignore
index 2431706f0d0c2a886687bdbc5d1592e1f36badc9..4c52adb65793e8cad77582cc519ddbd5b1ec15b9 100644 (file)
--- a/.bzrignore
+++ b/.bzrignore
@@ -1,3 +1,6 @@
+*.BASE
+*.OTHER
+*.THIS
 *.exe
 *.lo
 *.output
@@ -54,7 +57,7 @@ docs/doctest/
 docs/doctrees/
 docs/html/
 docs/linkcheck/
-docs/man/*
+docs/conf.py
 example/memcached_light
 libhashkit/configure.h
 libmemcached-*.tar.gz
@@ -96,3 +99,8 @@ tests/testplus
 tests/testudp
 tests/var/
 unittests/unittests
+libtest/wait
+docs/text
+docs/changes
+tests/cycle
+libtest/unittest