diff configure.ac @ 551:e8e4552fbf70 with-dependencies

Merge from the default branch
author Chris Cannam <chris.cannam@eecs.qmul.ac.uk>
date Fri, 10 May 2013 12:09:08 +0100
parents c928aa734e6b
children 358541da1cd8
line wrap: on
line diff
--- a/configure.ac	Thu May 09 11:01:52 2013 +0100
+++ b/configure.ac	Fri May 10 12:09:08 2013 +0100
@@ -1,5 +1,5 @@
 
-AC_INIT([Sonic Visualiser], 2.0.1, cannam@all-day-breakfast.com)
+AC_INIT([Sonic Visualiser], 2.1, cannam@all-day-breakfast.com)
 
 AC_CONFIG_SRCDIR(main/main.cpp)
 
@@ -131,5 +131,5 @@
 
 The file config.pri contains the configuration settings for
 qmake.  If you want to adjust these by hand, edit config.pri
-and run "qmake -r" again to regenerate the Makefile.
+and run "$QMAKE -r" again to regenerate the Makefile.
 ])