Merge trunk for LP

[awesomized/libmemcached] / .bzrignore

diff --git a/.bzrignore b/.bzrignore
index 1414c33c644b238b2d6a2610ffc5d8bb3de44564..4c52adb65793e8cad77582cc519ddbd5b1ec15b9 100644 (file)
--- a/.bzrignore
+++ b/.bzrignore
@@ -1,3 +1,6 @@
+*.BASE
+*.OTHER
+*.THIS
 *.exe
 *.lo
 *.output
@@ -49,6 +52,7 @@ config/top.h
 configure
 docs/*.[13]
 docs/*.html
+docs/conf.py
 docs/doctest/
 docs/doctrees/
 docs/html/
@@ -95,3 +99,8 @@ tests/testplus
 tests/testudp
 tests/var/
 unittests/unittests
+libtest/wait
+docs/text
+docs/changes
+tests/cycle
+libtest/unittest