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)
commitc525330153f07acaf5b22073e7b33745135314f5
treedd9e31e1086bb0c89dd3e88d391fa2a3038fe6a5
parent435ea846db833d4197b0f0c91856482bd6536b96
parent34eabf4df0ba895ac40f1506c700ea56e6f8ad79
Merge remote branch 'upstream_kahrl/collision_allow_stairs_v2' into object_object_collision
data/mods/default/init.lua