projects / oweals / minetest.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2095b15 74ef5b8)
Merge branch 'upstream/master'
authorNils Dagsson Moskopp <nils@dieweltistgarnichtso.net>
Wed, 20 Jul 2011 12:20:07 +0000 (14:20 +0200)
committerNils Dagsson Moskopp <nils@dieweltistgarnichtso.net>
Wed, 20 Jul 2011 12:20:07 +0000 (14:20 +0200)
1  2 
src/map.cpp patch | diff1 | diff2 | blob | history

diff --cc src/map.cpp
Simple merge
Unnamed repository; edit this file 'description' to name the repository.