projects / oweals / minetest.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4d20f12 afa2b87)
Merge remote-tracking branch 'origin/upstream'
authorNils Dagsson Moskopp <nils@dieweltistgarnichtso.net>
Sat, 16 Jul 2011 14:52:45 +0000 (16:52 +0200)
committerNils Dagsson Moskopp <nils@dieweltistgarnichtso.net>
Sat, 16 Jul 2011 14:52:45 +0000 (16:52 +0200)

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.