chiark
/
gitweb
/
~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from 3.0 branch
[disorder]
/
.bzrignore
diff --git
a/.bzrignore
b/.bzrignore
index 9fda4fa59ccf2243a39f9c8ec56734bbb3c0292c..e4a97a8c7440969e28d3db446214a11d949c2dd9 100644
(file)
--- a/
.bzrignore
+++ b/
.bzrignore
@@
-93,8
+93,7
@@
TAGS
ktrace.out
tests/Makefile
tests/testroot
ktrace.out
tests/Makefile
tests/testroot
-disorder.plist
-server/uk.org.greenend.rjk.disorder.plist
+examples/uk.org.greenend.rjk.disorder.plist
doc/guts
clients/disorder-playrtp
doc/disorder-playrtp.1.html
doc/guts
clients/disorder-playrtp
doc/disorder-playrtp.1.html
@@
-141,7
+140,10
@@
server/index.html
.DS_Store
tests/disorder-udplog
lib/version-string
.DS_Store
tests/disorder-udplog
lib/version-string
-lib/version.h
+lib/version
string
.h
scripts/setup
examples/disorder.rc
scripts/teardown
scripts/setup
examples/disorder.rc
scripts/teardown
+sounds/long.ogg
+sounds/slap.raw
+server/disorder-choose