Merge from 3.0 fixes branch

[disorder] / .bzrignore

diff --git a/.bzrignore b/.bzrignore
index e34c30c9c992ac9d9d52e520b9dd59c1d18bfc52..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
@@ -140,3 +139,11 @@ 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