Merge branch 'master' of github.com:musescore/MuseScore

musescore · Mar 27, 2015 · a249aea · a249aea
2 parents 31f879e + e26f32d
commit a249aea
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -130,7 +130,7 @@ set(CMAKE_SKIP_RULE_DEPENDENCY TRUE)
 # The Mscore version number.
 SET (MUSESCORE_NAME "MuseScore")
 SET(MUSESCORE_VERSION_MAJOR  "2")
-SET(MUSESCORE_VERSION_MINOR  "0")
+SET(MUSESCORE_VERSION_MINOR  "1")
 SET(MUSESCORE_VERSION_PATCH  "0")
 SET(MUSESCORE_VERSION       "${MUSESCORE_VERSION_MAJOR}.${MUSESCORE_VERSION_MINOR}")
 SET(MUSESCORE_NAME_VERSION "${MUSESCORE_NAME} ${MUSESCORE_VERSION_MAJOR}")
@@ -155,7 +155,7 @@ endif (MINGW OR APPLE)
 ##
 ##  look for Qt5
 ##
-SET(QT_MIN_VERSION    "5.2.0")
+SET(QT_MIN_VERSION    "5.3.0")
 
 SET(QT_USE_QTXML         TRUE)
 SET(QT_USE_QTSVG         TRUE)

diff --git a/Makefile.mingw b/Makefile.mingw
@@ -20,7 +20,7 @@
 
 
 REVISION  = $(shell type mscore\revision.h)
-#VERSION   = 2.0b-${REVISION}
+VERSION   = 2.1b-${REVISION}
 #VERSION = 2.1.0
 CPUS = 1