projects / zefram / minetest / minetest_engine.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f4d7530 2f6e931)
Merge branch 'master' of github.com:erlehmann/minetest-delta
authorNils Dagsson Moskopp <nils@dieweltistgarnichtso.net>
Sat, 30 Jul 2011 21:08:52 +0000 (23:08 +0200)
committerNils Dagsson Moskopp <nils@dieweltistgarnichtso.net>
Sat, 30 Jul 2011 21:08:52 +0000 (23:08 +0200)

Trivial merge
Minetest engine