Merge from OS X GTK+ branch

[disorder] / .bzrignore

diff --git a/.bzrignore b/.bzrignore
index 99a65d9..ec15e8e 100644 (file)
--- a/.bzrignore
+++ b/.bzrignore
@@ -194,3 +194,11 @@ libtests/t-dateparse
 libtests/Makefile
 cgi/Makefile
 libtests/index.html
+libtests/t-eventdist
+doc/disorder_preferences.5
+doc/disorder_preferences.5.html
+plugins/index.html
+doc/disorder-choose.8
+doc/disorder-choose.8.html
+config.aux/compile
+server/endian