aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorNils Dagsson Moskopp <nils@dieweltistgarnichtso.net>2011-07-14 22:43:22 +0200
committerNils Dagsson Moskopp <nils@dieweltistgarnichtso.net>2011-07-14 22:43:28 +0200
commitaf05e4b2defde537f3b953a7dae0ef44fae225aa (patch)
tree3f751014432b35df1cc2fd6fb976410e86b70e73 /doc
parent4415d95c503f083d871abaf84516f2b6487ecb60 (diff)
parent81535f6277b66c869cda7125b2aeaf99e8078b92 (diff)
downloadminetest-af05e4b2defde537f3b953a7dae0ef44fae225aa.tar.gz
minetest-af05e4b2defde537f3b953a7dae0ef44fae225aa.tar.bz2
minetest-af05e4b2defde537f3b953a7dae0ef44fae225aa.zip
Merge branch 'upstream/master'
Conflicts: data/oerkki1.png src/client.cpp
Diffstat (limited to 'doc')
-rw-r--r--doc/changelog.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/doc/changelog.txt b/doc/changelog.txt
index 5a01b6bc4..58d28d236 100644
--- 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