Merge from 3.0 fixes branch

[disorder] / .bzrignore

diff --git a/.bzrignore b/.bzrignore
index a08805f1c5f2f90bc77c2b658f71de1c12fe1ebc..e4a97a8c7440969e28d3db446214a11d949c2dd9 100644 (file)
--- a/.bzrignore
+++ b/.bzrignore
@@ -144,3 +144,6 @@ lib/versionstring.h
 scripts/setup
 examples/disorder.rc
 scripts/teardown
+sounds/long.ogg
+sounds/slap.raw
+server/disorder-choose