Skip to content

Commit

Permalink
switch master to version 3.3
Browse files Browse the repository at this point in the history
Increase clone depth to 50 to align with Travis jobs. It is time now because the issue with free space on AppVeyor was solved.
  • Loading branch information
anatoly-os committed Jul 9, 2019
1 parent 1a0076b commit d2d40fb
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
clone_folder: C:\MuseScore

# set clone depth
clone_depth: 3 # clone entire repository history if not defined
clone_depth: 50 # clone entire repository history if not defined

image: Visual Studio 2017

Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ set(CMAKE_SKIP_RULE_DEPENDENCY TRUE)
# The MuseScore version number.
SET(MUSESCORE_NAME "MuseScore")
SET(MUSESCORE_VERSION_MAJOR "3")
SET(MUSESCORE_VERSION_MINOR "2")
SET(MUSESCORE_VERSION_MINOR "3")
SET(MUSESCORE_VERSION_PATCH "0")
SET(MUSESCORE_VERSION_LABEL "")
SET(MUSESCORE_VERSION "${MUSESCORE_VERSION_MAJOR}.${MUSESCORE_VERSION_MINOR}")
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ REVISION := `cat mscore/revision.h`
CPUS := $(shell getconf _NPROCESSORS_ONLN 2>/dev/null || getconf NPROCESSORS_ONLN 2>/dev/null || echo 1)

PREFIX = "/usr/local"
VERSION = "3.2b-${REVISION}"
VERSION = "3.3b-${REVISION}"
#VERSION = 3.1.0
BUILD_NUMBER=""

Expand Down
2 changes: 1 addition & 1 deletion Makefile.mingw
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@


REVISION = $(shell type mscore\revision.h)
VERSION = 3.2b-${REVISION}
VERSION = 3.3b-${REVISION}
#VERSION = 3.1.0
BUILD_NUMBER=""
CPUS = %NUMBER_OF_PROCESSORS%
Expand Down
2 changes: 1 addition & 1 deletion Makefile.osx
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#=============================================================================

REVISION = `cat mscore/revision.h`
VERSION = "3.2b-${REVISION}"
VERSION = "3.3b-${REVISION}"
#VERSION = 3.1.0
BUILD_NUMBER = ""
PREFIX=../applebuild
Expand Down
2 changes: 1 addition & 1 deletion build/package_mac
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ then
else
LONG_NAME=MuseScore
LONGER_NAME="MuseScore 3"
VERSION=3.2.0
VERSION=3.3.0
fi


Expand Down
2 changes: 1 addition & 1 deletion mscore/resourceManager.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class ResourceManager : public QDialog, public Ui::Resource
void selectLanguagesTab();
void selectExtensionsTab();

static inline QString baseAddr() { return "http://extensions.musescore.org/3.2/"; }
static inline QString baseAddr() { return "http://extensions.musescore.org/3.3/"; }

private:
QMap <QPushButton *, QString> languageButtonMap; // QPushButton -> filename
Expand Down

0 comments on commit d2d40fb

Please sign in to comment.