projects / oweals / minetest.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2b3bc33 f706644)
merged some stuff from upstream while merging delta
authorPerttu Ahola <celeron55@gmail.com>
Sat, 23 Jul 2011 12:46:00 +0000 (15:46 +0300)
committerPerttu Ahola <celeron55@gmail.com>
Sat, 23 Jul 2011 12:46:00 +0000 (15:46 +0300)
1  2 
src/map.cpp patch | diff1 | diff2 | blob | history
src/mapgen.cpp patch | diff1 | diff2 | blob | history

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