Updated version and changelog

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 516778995621b2dbde7cc9a4c5dce994f5d6e85b..6403a9dd94ec3d562607fc1e16c5dd02d2211e0b 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,7 +9,7 @@ project(minetest)
 
 set(VERSION_MAJOR 0)
 set(VERSION_MINOR 2)
-set(VERSION_PATCH 20110618_0_dev)
+set(VERSION_PATCH 20110704_0)
 set(VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
 
 # Configuration options

diff --git a/doc/changelog.txt b/doc/changelog.txt
index 5a01b6bc48a23cfdacf158d30a5ed9731ffbd0cf..58d28d23690c80eafcc5d06c0c3c8187f3c24077 100644 (file)
--- a/doc/changelog.txt
+++ b/doc/changelog.txt
@@ -3,6 +3,11 @@ Minetest-c55 changelog
 This should contain all the major changes.
 For minor stuff, refer to the commit log of the repository.
 
+2011-07-04:
+- Many small fixes
+- Code reorganizing to aid further development
+- Renewed map generator
+
 2011-06-02:
 - Password crash on windows fixed
 - Optimized server CPU usage a lot