Merge from 3.0 fixes branch

[disorder] / .bzrignore

diff --git a/.bzrignore b/.bzrignore
index 1b45fb1d88ffb4c5a04395a32f6df2a80ba2eaf0..e4a97a8c7440969e28d3db446214a11d949c2dd9 100644 (file)
--- a/.bzrignore
+++ b/.bzrignore
@@ -93,8 +93,7 @@ TAGS
 ktrace.out
 tests/Makefile
 tests/testroot
-disorder.plist
-server/uk.org.greenend.rjk.disorder.plist
+examples/uk.org.greenend.rjk.disorder.plist
 doc/guts
 clients/disorder-playrtp
 doc/disorder-playrtp.1.html
@@ -130,3 +129,21 @@ tests/*.log
 server/disorder-dbupgrade
 doc/disorder-dbupgrade.8.html
 doc/disorder-dbupgrade.8
+*.gcov
+*.gcno
+*.gcda
+*.c.html
+clients/index.html
+disobedience/index.html
+lib/index.html
+server/index.html
+.DS_Store
+tests/disorder-udplog
+lib/version-string
+lib/versionstring.h
+scripts/setup
+examples/disorder.rc
+scripts/teardown
+sounds/long.ogg
+sounds/slap.raw
+server/disorder-choose