diff options
| author | Forkk <forkk@forkk.net> | 2014-01-08 22:52:49 -0600 |
|---|---|---|
| committer | Forkk <forkk@forkk.net> | 2014-01-08 22:52:49 -0600 |
| commit | 0e22e4b399c1fb113a791ae665ff5adbbc680d5e (patch) | |
| tree | 1b29f9a48318b06b0a659b8686202d4a534c9bc1 | |
| parent | 0b1e0221f0389c94e863e55761905e2192a57c71 (diff) | |
| parent | 48b587e7b6b96b5c3ac17dc8b67a7b0ab9c2c4f0 (diff) | |
| download | PrismLauncher-0e22e4b399c1fb113a791ae665ff5adbbc680d5e.tar.gz PrismLauncher-0e22e4b399c1fb113a791ae665ff5adbbc680d5e.tar.bz2 PrismLauncher-0e22e4b399c1fb113a791ae665ff5adbbc680d5e.zip | |
Merge branch 'master' into develop
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | changelog.yaml | 2 | ||||
| -rw-r--r-- | gui/MainWindow.cpp | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index ea44f375..d3779a74 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -91,7 +91,7 @@ SET(MultiMC_NEWS_RSS_URL "http://multimc.org/rss.xml" CACHE STRING "URL to fetch ######## Set version numbers ######## SET(MultiMC_VERSION_MAJOR 0) SET(MultiMC_VERSION_MINOR 1) -SET(MultiMC_VERSION_HOTFIX 0) +SET(MultiMC_VERSION_HOTFIX 1) # Build number SET(MultiMC_VERSION_BUILD -1 CACHE STRING "Build number. -1 for no build number.") diff --git a/changelog.yaml b/changelog.yaml index 0e41abdd..82dccd69 100644 --- a/changelog.yaml +++ b/changelog.yaml @@ -14,4 +14,6 @@ - Fixed sorting of Java installations in the Java list. - Jar files are now distributed separately, rather than being extracted from the binary at runtime. - Added additional information to the about dialog. +0.1.1: + - Hotfix - Changed the issue tracker URL to [GitHub issues](https://github.com/MultiMC/MultiMC5/issues). diff --git a/gui/MainWindow.cpp b/gui/MainWindow.cpp index 69cdf602..31e4b9e4 100644 --- a/gui/MainWindow.cpp +++ b/gui/MainWindow.cpp @@ -857,7 +857,7 @@ void MainWindow::on_actionManageAccounts_triggered() void MainWindow::on_actionReportBug_triggered() { - openWebPage(QUrl("http://multimc.myjetbrains.com/youtrack/dashboard#newissue=yes")); + openWebPage(QUrl("https://github.com/MultiMC/MultiMC5/issues")); } void MainWindow::on_actionMoreNews_triggered() |