Merge fixes up to 3.0.1

[disorder] / .bzrignore

diff --git a/.bzrignore b/.bzrignore
index 5c8238b0a73d2cfcbfc06a52b4aa8b842cbeef33..e4a97a8c7440969e28d3db446214a11d949c2dd9 100644 (file)
--- a/.bzrignore
+++ b/.bzrignore
@@ -146,3 +146,4 @@ examples/disorder.rc
 scripts/teardown
 sounds/long.ogg
 sounds/slap.raw
+server/disorder-choose