diff options
| author | Jan Dalheimer <jan@dalheimer.de> | 2014-01-24 22:00:34 +0100 |
|---|---|---|
| committer | Jan Dalheimer <jan@dalheimer.de> | 2014-01-24 22:00:34 +0100 |
| commit | 966f9d1206fee51641c9ae844323f85316a59b1d (patch) | |
| tree | 3c4847ae5b7248470301f06c2c2865816ce368f8 | |
| parent | 0f7b38c76bacc210beae21c4e23cc312f53fa5e4 (diff) | |
| parent | d7113de3bd3cb43b1bc68792cd27a716b012f2b5 (diff) | |
| download | MultiMC-966f9d1206fee51641c9ae844323f85316a59b1d.tar MultiMC-966f9d1206fee51641c9ae844323f85316a59b1d.tar.gz MultiMC-966f9d1206fee51641c9ae844323f85316a59b1d.tar.lz MultiMC-966f9d1206fee51641c9ae844323f85316a59b1d.tar.xz MultiMC-966f9d1206fee51641c9ae844323f85316a59b1d.zip | |
Merge branch 'develop' into feature_derpstances
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | changelog.yaml | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 6218ee7a..0acebacf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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.") diff --git a/changelog.yaml b/changelog.yaml index 01e11f52..8b96b76e 100644 --- a/changelog.yaml +++ b/changelog.yaml @@ -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. |