changeset 443:b8025c99fe68 toggle

Merge from the default branch
author Chris Cannam
date Fri, 24 Jun 2011 09:31:33 +0100 (2011-06-24)
parents 3b7f412dfb51 (current diff) 097f97218c66 (diff)
children 4d9e4053c120
files
diffstat 1 files changed, 7 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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$