projects / zefram / minetest / minetest_engine.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 58bc6f3 a75c311)
Merge remote-tracking branch 'upstream/master'
authorteddydestodes <derkomtur@schattengang.net>
Wed, 1 Jun 2011 17:47:10 +0000 (19:47 +0200)
committerteddydestodes <derkomtur@schattengang.net>
Wed, 1 Jun 2011 17:47:10 +0000 (19:47 +0200)

Trivial merge
Minetest engine