projects / zefram / minetest / minetest_engine.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ad6b087 a5a9c9f)
Merge branch 'master' of github.com:erlehmann/minetest-delta
authorNils Dagsson Moskopp <nils@dieweltistgarnichtso.net>
Sun, 24 Jul 2011 18:04:20 +0000 (20:04 +0200)
committerNils Dagsson Moskopp <nils@dieweltistgarnichtso.net>
Sun, 24 Jul 2011 18:04:20 +0000 (20:04 +0200)

Trivial merge
Minetest engine