summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorForkk <forkk@forkk.net>2014-01-08 22:51:57 -0600
committerForkk <forkk@forkk.net>2014-01-08 22:51:57 -0600
commit48b587e7b6b96b5c3ac17dc8b67a7b0ab9c2c4f0 (patch)
treee70e43db102fa3e60172f93178bf140ac228f8fb
parent06b5fa5dccdfc54496cd79e6eba6d025bc6e1204 (diff)
parent7d74c9bc2574609470c886b1c4cf1a4776e8d70a (diff)
downloadMultiMC-48b587e7b6b96b5c3ac17dc8b67a7b0ab9c2c4f0.tar
MultiMC-48b587e7b6b96b5c3ac17dc8b67a7b0ab9c2c4f0.tar.gz
MultiMC-48b587e7b6b96b5c3ac17dc8b67a7b0ab9c2c4f0.tar.lz
MultiMC-48b587e7b6b96b5c3ac17dc8b67a7b0ab9c2c4f0.tar.xz
MultiMC-48b587e7b6b96b5c3ac17dc8b67a7b0ab9c2c4f0.zip
Merge branch 'hotfix-0.1.1'0.1.1
This is a quick hotfix to correct the issue tracker URL. Forgot to do so in the last release.
-rw-r--r--CMakeLists.txt2
-rw-r--r--changelog.yaml2
-rw-r--r--gui/MainWindow.cpp2
3 files changed, 4 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 274e4155..425ddf5f 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()