Merge from dmanual branch

[disorder] / .bzrignore

diff --git a/.bzrignore b/.bzrignore
index 22ff521df6ad14178cdc6c3c950568ea5829676b..4551219feb24bd47b94e4f30f343e3e71986e100 100644 (file)
--- a/.bzrignore
+++ b/.bzrignore
@@ -143,8 +143,6 @@ lib/versionstring.h
 scripts/setup
 examples/disorder.rc
 scripts/teardown
-sounds/long.ogg
-sounds/slap.raw
 server/disorder-choose
 libtests/t-addr
 libtests/t-basen
@@ -195,3 +193,14 @@ libtests/Makefile
 cgi/Makefile
 libtests/index.html
 libtests/t-eventdist
+doc/disorder_preferences.5
+doc/disorder_preferences.5.html
+plugins/index.html
+doc/disorder-choose.8
+doc/disorder-choose.8.html
+config.aux/compile
+server/endian
+clients/rtpmon
+libtests/t-resample
+clients/resample
+disobedience/manual/Makefile