projects / zefram / minetest / minetest_engine.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9bc701d 489a7ef)
Merge branch 'master' of github.com:erlehmann/minetest-delta
authorNils Dagsson Moskopp <nils@dieweltistgarnichtso.net>
Wed, 20 Jul 2011 15:56:49 +0000 (17:56 +0200)
committerNils Dagsson Moskopp <nils@dieweltistgarnichtso.net>
Wed, 20 Jul 2011 15:56:49 +0000 (17:56 +0200)

Trivial merge
Minetest engine