Merge.

[awesomized/libmemcached] / .bzrignore

diff --git a/.bzrignore b/.bzrignore
index 9726145e060a1b319afdeb49da6a465cc90a8c9a..ea78c2ef1c78cf4f788d1d4cf0a44097ea267005 100644 (file)
--- a/.bzrignore
+++ b/.bzrignore
@@ -1,4 +1,5 @@
 *.lo
+*.pop
 */*.l[oa]
 */*/*.l[oa]
 */*/.deps
@@ -58,11 +59,14 @@ hashkit_jenkins.pop
 hashkit_md5.pop
 hashkit_murmur.pop
 hashkit_value.pop
+libhashkit/configure.h
 libmemcached-*.tar.gz
 libmemcached-0.30-1.src.rpm
 libmemcached-0.30-1.x86_64.rpm
 libmemcached-0.31-1.src.rpm
 libmemcached-0.31-1.x86_64.rpm
+libmemcached-0.37-1.src.rpm
+libmemcached-0.37-1.x86_64.rpm
 libmemcached-?.??/
 libmemcached.pop
 libmemcached/configure.h
@@ -160,6 +164,8 @@ memflush.pop
 memrm.pop
 memslap.pop
 memstat.pop
+patch
+patch2
 stamp-h1
 support/Makefile
 support/Makefile.in
@@ -167,9 +173,12 @@ support/libmemcached-fc.spec
 support/libmemcached.pc
 support/libmemcached.spec
 tests/atomsmasher
+tests/hashplus
+tests/memplus
 tests/output.cmp
 tests/startservers
 tests/testapp
 tests/testhashkit
 tests/testplus
-tests/udptest
+tests/testudp
+unittests/unittests