projects / oweals / minetest.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 158b054 7efe89f)
Merge pull request #13 from Bahamada/upstream_merge
authorNils Dagsson Moskopp <nils@dieweltistgarnichtso.net>
Mon, 27 Jun 2011 13:56:26 +0000 (06:56 -0700)
committerNils Dagsson Moskopp <nils@dieweltistgarnichtso.net>
Mon, 27 Jun 2011 13:56:26 +0000 (06:56 -0700)
Upstream merge


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