# HG changeset patch
# User Chris Cannam
# Date 1368116424 -3600
# Node ID 8103ad8eef87f685a3399d7907b906241e2947b6
# Parent  4163ddee7c00029ab41f5532d3873f998c87956a# Parent  724ded57504183e771ecb4d41bd1e01e446a8338
Merge from qt5 branch. Next release will require qt5

diff -r 724ded575041 -r 8103ad8eef87 configure
--- a/configure	Fri Apr 26 16:41:27 2013 +0100
+++ b/configure	Thu May 09 17:20:24 2013 +0100
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for Sonic Visualiser 2.0.1.
+# Generated by GNU Autoconf 2.69 for Sonic Visualiser 2.1.
 #
 # Report bugs to <cannam@all-day-breakfast.com>.
 #
@@ -580,8 +580,8 @@
 # Identity of this package.
 PACKAGE_NAME='Sonic Visualiser'
 PACKAGE_TARNAME='sonic-visualiser'
-PACKAGE_VERSION='2.0.1'
-PACKAGE_STRING='Sonic Visualiser 2.0.1'
+PACKAGE_VERSION='2.1'
+PACKAGE_STRING='Sonic Visualiser 2.1'
 PACKAGE_BUGREPORT='cannam@all-day-breakfast.com'
 PACKAGE_URL=''
 
@@ -1329,7 +1329,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures Sonic Visualiser 2.0.1 to adapt to many kinds of systems.
+\`configure' configures Sonic Visualiser 2.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1391,7 +1391,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Sonic Visualiser 2.0.1:";;
+     short | recursive ) echo "Configuration of Sonic Visualiser 2.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1542,7 +1542,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Sonic Visualiser configure 2.0.1
+Sonic Visualiser configure 2.1
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1882,7 +1882,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by Sonic Visualiser $as_me 2.0.1, which was
+It was created by Sonic Visualiser $as_me 2.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -7746,7 +7746,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by Sonic Visualiser $as_me 2.0.1, which was
+This file was extended by Sonic Visualiser $as_me 2.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -7799,7 +7799,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-Sonic Visualiser config.status 2.0.1
+Sonic Visualiser config.status 2.1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff -r 724ded575041 -r 8103ad8eef87 configure.ac
--- a/configure.ac	Fri Apr 26 16:41:27 2013 +0100
+++ b/configure.ac	Thu May 09 17:20:24 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)