Merge in local trunk

[m6w6/libmemcached] / .bzrignore

diff --git a/.bzrignore b/.bzrignore
index 73d93db3e789967e35c7eff8a7b13b759e670bfd..ab5bf8323e13c91c52344b94f2a37d9d7264c922 100644 (file)
--- a/.bzrignore
+++ b/.bzrignore
@@ -1,25 +1,34 @@
+*.exe
 *.lo
-*/.deps
-*/.libs
+*.output
+*.pop
+*.rpm
+*/*.l[oa]
+*/*/*.l[oa]
 */*/.deps
+*/*/.dirstamp
 */*/.libs
+*/.deps
+*/.dirstamp
+*/.libs
 */Makefile
 */Makefile.in
-*/*.l[oa]
-*/*/*.l[oa]
 *TAGS
+.deps
 INSTALL
 Makefile
 Makefile.in
 TAGS
 aclocal.m4
 autom4te.cache
+clients/memaslap
 clients/memcapable
 clients/memcat
 clients/memcp
 clients/memdump
 clients/memerror
 clients/memflush
+clients/memparse
 clients/memrm
 clients/memslap
 clients/memstat
@@ -34,11 +43,29 @@ config/depcomp
 config/install-sh
 config/ltmain.sh
 config/missing
+config/pandora_vc_revinfo
 config/plugin.ac
+config/top.h
 configure
 docs/*.[13]
+docs/*.html
+docs/doctest/
+docs/doctrees/
+docs/html/
+docs/linkcheck/
 example/memcached_light
+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/configure.h
+libmemcached/dtrace_probes.h
+libmemcached/generated_probes.h
 libmemcached/memcached_configure.h
 libtool
 libtool.m4
@@ -46,20 +73,24 @@ ltoptions.m4
 ltsugar.m4
 ltversion.m4
 lt~obsolete.m4
+patch
+patch2
 stamp-h1
 support/Makefile
 support/Makefile.in
 support/libmemcached-fc.spec
 support/libmemcached.pc
 support/libmemcached.spec
+tags
 tests/atomsmasher
+tests/hash_plus
+tests/hashplus
+tests/memplus
 tests/output.cmp
 tests/startservers
 tests/testapp
+tests/testhashkit
 tests/testplus
-tests/udptest
-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-?.??/
+tests/testudp
+tests/var/
+unittests/unittests