summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2014-11-16 03:02:13 +0100
committerPetr Mrázek <peterix@gmail.com>2014-11-16 04:04:24 +0100
commit6a09fd2898fcb76c265e12d5221d332157d8f683 (patch)
tree8b2df00b175f9cb8f4e7c81cb37cb58e95660fe1
parent03a25c9a5daf05655ce65d1d4d91d4784252f3d5 (diff)
downloadMultiMC-6a09fd2898fcb76c265e12d5221d332157d8f683.tar
MultiMC-6a09fd2898fcb76c265e12d5221d332157d8f683.tar.gz
MultiMC-6a09fd2898fcb76c265e12d5221d332157d8f683.tar.lz
MultiMC-6a09fd2898fcb76c265e12d5221d332157d8f683.tar.xz
MultiMC-6a09fd2898fcb76c265e12d5221d332157d8f683.zip
Set versions back to develop
-rw-r--r--CMakeLists.txt4
-rw-r--r--changelog.md3
2 files changed, 5 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 21b584af..77c4770c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -82,8 +82,8 @@ 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 4)
+set(MultiMC_VERSION_MINOR 5)
+set(MultiMC_VERSION_HOTFIX 0)
# 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 a0c700a1..275fe932 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,8 @@
#MultiMC Changelog
+##0.5.0
+- In development...
+
##0.4.4
- Other logs larger than 10MB will not load to prevent logs eating the whole available memory
- Translations are now updated independently from MultiMC