Merge trunk for LP

[awesomized/libmemcached] / .bzrignore

diff --git a/.bzrignore b/.bzrignore
index f4695169333c534d92bd44e71624b6d95d7ad025..4c52adb65793e8cad77582cc519ddbd5b1ec15b9 100644 (file)
--- a/.bzrignore
+++ b/.bzrignore
@@ -57,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
@@ -99,3 +99,8 @@ tests/testplus
 tests/testudp
 tests/var/
 unittests/unittests
+libtest/wait
+docs/text
+docs/changes
+tests/cycle
+libtest/unittest