projects / oweals / minetest.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 435ea84 34eabf4)
Merge remote branch 'upstream_kahrl/collision_allow_stairs_v2' into object_object_col...
authorsapier <sapier at gmx dot net>
Tue, 7 Feb 2012 15:57:36 +0000 (16:57 +0100)
committersapier <sapier at gmx dot net>
Tue, 7 Feb 2012 15:57:36 +0000 (16:57 +0100)
1  2 
data/mods/default/init.lua patch | diff1 | diff2 | blob | history

diff --cc data/mods/default/init.lua
Simple merge
Unnamed repository; edit this file 'description' to name the repository.