Merge from Mark's branch.

[disorder] / .bzrignore

diff --git a/.bzrignore b/.bzrignore
index 24e1ed6..b183b9f 100644 (file)
--- a/.bzrignore
+++ b/.bzrignore
@@ -85,3 +85,6 @@ sounds/Makefile
 templates/Makefile
 .bzr.backup
 doc/disorder-speaker.8.html
+.gdb_history
+core
+vgcore.*