Update changelog and version to 0.2.20110922_rc1

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ff6db1698c481d975a589b23bf936cceb9285b79..ec73b2724942bf51e16790cec78000010716996d 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 201109xx_dev)
+set(VERSION_PATCH 20110922_rc1)
 set(VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
 
 # Configuration options

diff --git a/doc/changelog.txt b/doc/changelog.txt
index 0b8f83636059dba5698a24d60ee65d2b5df68129..79d09b1cfc42180145ce442410910e86405b79d4 100644 (file)
--- a/doc/changelog.txt
+++ b/doc/changelog.txt
@@ -3,17 +3,17 @@ Minetest-c55 changelog
 This should contain all the major changes.
 For minor stuff, refer to the commit log of the repository.
 
-X:
-- Ladders
+0.2.20110922_rc1:
+- Map is saved in an SQLite database file (by Queatz)
+- Ladders (MarkTraceur)
 - Lava
-- /me chat command
-- Slightly better looking inventory (transparency)
+- Apple trees (sfan5)
+- Slightly better looking inventory with transparency
+- /me chat command (Oblomov)
+- Using chosen map seed possible through fixed_map_seed configuration option (kahrl)
 - Fix the long-existed PeerNotFound loop bug
 - Some translations and localization-related fixes
-- Lots of small fixes, once again
-- Using chosen map seed is now possible through fixed_map_seed configuration option
-- Map is now saved in an SQLite database
-- Fixed the nasty server-side infinite PeerNotFound loop bug
+- Lots of small fixes
 
 2011-07-31_3:
 - Fixes a bug that made the server to deny non-empty passwords from players connecting the first time