# HG changeset patch
# User Chris Cannam
# Date 1308914264 -3600
# Node ID fa0c3e79ea8e9cd1effff8fd7afa06950c9e0fa9
# Parent  12a116e113ab9a2a93d8a560da8295d8bc1f4522# Parent  097f97218c669d94c4283387522bab2d60289602
Merge from 441:097f97218c66

diff -r 12a116e113ab -r fa0c3e79ea8e .hgignore
--- a/.hgignore	Fri Jun 24 12:17:22 2011 +0100
+++ b/.hgignore	Fri Jun 24 12:17:44 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$