Merge branch 'develop' into feature_derpstances

This commit is contained in:
Jan Dalheimer 2014-01-24 22:00:34 +01:00
commit 966f9d1206
2 changed files with 3 additions and 1 deletions

View File

@ -93,7 +93,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 2)
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.")

View File

@ -29,3 +29,5 @@
- Started using icon themes for the application icons, fixing many OSX graphical glitches.
- Icon sources have been located, along with icon licenses.
- Update to the German translation.
0.2.1:
- Hotfix - move the native library extraction into the onesix launcher part.