From 06080108f33e0b739a11c2875e62cb254b18dca5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= <peterix@gmail.com>
Date: Thu, 21 May 2015 01:13:05 +0200
Subject: [PATCH] GH-980 update version number and changelog for 0.4.7

---
 application/CMakeLists.txt |  2 +-
 changelog.md               | 22 ++++++++++++++++++----
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/application/CMakeLists.txt b/application/CMakeLists.txt
index b35eabea5..bd7fc64e7 100644
--- a/application/CMakeLists.txt
+++ b/application/CMakeLists.txt
@@ -6,7 +6,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	 4)
-set(MultiMC_VERSION_HOTFIX   6)
+set(MultiMC_VERSION_HOTFIX   7)
 
 # Build number
 set(MultiMC_VERSION_BUILD -1 CACHE STRING "Build number. -1 for no build number.")
diff --git a/changelog.md b/changelog.md
index ac4b2fa28..a998b2f80 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,6 +1,20 @@
-#MultiMC 0.4.6
+#MultiMC 0.4.7
+
+In progress.
 
 ##Functional changes
+- A copy of the libstdc++ library is now included in linux releases, improving compatibility
+
+##UI changes
+- Fixed help button for the External tools and Accounts dialog pages not linking to the proper wiki places
+
+#Previous releases
+
+##0.4.6
+
+Long time coming, this release brought a lot of incremental improvements and fixes.
+
+###Functional changes
 - Old version.json and custom.json version files will be transformed into a minecraft version patch:
   - The process is automated
   - LWJGL entries are stripped from the original file - you may have to re-do LWJGL version customizations
@@ -38,7 +52,7 @@
 - Minecraft process ID is printed in the log on start
 - SSL certificates are fixed on OSX 10.10.3 and newer - see [explanation](http://www.infoworld.com/article/2911209/mac-os-x/yosemite-10103-breaks-some-applications-and-https-sites.html).
 
-##UI changes
+###UI changes
 - Version lists:
   - All version lists now include latest and recommended versions - recommended are pre-selected
   - Java version list now sorts versions based on suitability - best on top
@@ -65,7 +79,7 @@
 - Errors are reported while updating the instance in the Version page
 - Fixed typos (forge -> Forge)
 
-##Internals
+###Internals
 - Massive internal restructuring (ongoing)
 - Downloads now follow redirects
 - Minecraft window size is now always at least 1x1 pixel (prevents crash from bad settings)
@@ -83,7 +97,7 @@
 - Groups are saved after copying an instance
 - MultiMC launcher part will now exit cleanly when MultiMC crashes or is closed during instance launch
 
-#Previous releases
+
 ##0.4.5
 - Copies of FTB instances should work again (GH-619)
 - Fixed OSX version not including the hotfix number