Merge from dmanual branch

[disorder] / .bzrignore

diff --git a/.bzrignore b/.bzrignore
index ec15e8ead6300c20032851c6812dcdbb6c69e172..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
@@ -202,3 +200,7 @@ doc/disorder-choose.8
 doc/disorder-choose.8.html
 config.aux/compile
 server/endian
+clients/rtpmon
+libtests/t-resample
+clients/resample
+disobedience/manual/Makefile