merge RTP branch

[disorder] / .bzrignore

diff --git a/.bzrignore b/.bzrignore
index 6a51fab..8704579 100644 (file)
--- a/.bzrignore
+++ b/.bzrignore
@@ -89,3 +89,13 @@ doc/disorder-speaker.8.html
 core
 vgcore.*
 *.tar.gz
+TAGS
+ktrace.out
+tests/Makefile
+tests/testroot
+disorder.plist
+server/uk.org.greenend.rjk.disorder.plist
+doc/guts
+clients/disorder-playrtp
+doc/disorder-playrtp.1.html
+doc/disorder-playrtp.1