CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Forkk 2014-01-08 22:52:49 -06:00
commit 0e22e4b399
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -91,7 +91,7 @@ SET(MultiMC_NEWS_RSS_URL "http://multimc.org/rss.xml" CACHE STRING "URL to fetch
######## Set version numbers ######## ######## Set version numbers ########
SET(MultiMC_VERSION_MAJOR 0) SET(MultiMC_VERSION_MAJOR 0)
SET(MultiMC_VERSION_MINOR 1) SET(MultiMC_VERSION_MINOR 1)
SET(MultiMC_VERSION_HOTFIX 0) SET(MultiMC_VERSION_HOTFIX 1)
# Build number # Build number
SET(MultiMC_VERSION_BUILD -1 CACHE STRING "Build number. -1 for no build number.") SET(MultiMC_VERSION_BUILD -1 CACHE STRING "Build number. -1 for no build number.")

2
changelog.yaml
View File

@ -14,4 +14,6 @@
- Fixed sorting of Java installations in the Java list. - Fixed sorting of Java installations in the Java list.
- Jar files are now distributed separately, rather than being extracted from the binary at runtime. - Jar files are now distributed separately, rather than being extracted from the binary at runtime.
- Added additional information to the about dialog. - 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).

2
gui/MainWindow.cpp
View File

@ -857,7 +857,7 @@ void MainWindow::on_actionManageAccounts_triggered()
void MainWindow::on_actionReportBug_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() void MainWindow::on_actionMoreNews_triggered()