# HG changeset patch
# User Chris Cannam
# Date 1308904293 -3600
# Node ID b8025c99fe682d8aa4c15160e40c75c579f5fa17
# Parent  3b7f412dfb516f03a828e9b689f6acf34dc0a15e# Parent  097f97218c669d94c4283387522bab2d60289602
Merge from the default branch

diff -r 3b7f412dfb51 -r b8025c99fe68 .hgignore
--- a/.hgignore	Wed Jun 22 13:14:33 2011 +0100
+++ b/.hgignore	Fri Jun 24 09:31:33 2011 +0100
@@ -14,3 +14,10 @@
 *~
 *.orig
 *.rej
+re:^autom4te\.cache/
+re:^qrc_sonic-visualiser\.cpp$
+re:^sonic-visualiser$
+re:^aclocal\.m4$
+re:^config\.log$
+re:^config\.pri$
+re:^config\.status$