Merge fixes up to 3.0.1

[disorder] / .bzrignore

diff --git a/.bzrignore b/.bzrignore
index 9fda4fa59ccf2243a39f9c8ec56734bbb3c0292c..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
@@ -141,7 +140,10 @@ server/index.html
 .DS_Store
 tests/disorder-udplog
 lib/version-string
-lib/version.h
+lib/versionstring.h
 scripts/setup
 examples/disorder.rc
 scripts/teardown
+sounds/long.ogg
+sounds/slap.raw
+server/disorder-choose