Merge remote branch 'upstream_kahrl/collision_allow_stairs_v2' into object_object_col...

author sapier <sapier at gmx dot net>

Sun, 5 Feb 2012 11:41:01 +0000 (12:41 +0100)

committer sapier <sapier at gmx dot net>

Sun, 5 Feb 2012 11:41:01 +0000 (12:41 +0100)
author sapier <sapier at gmx dot net>
Sun, 5 Feb 2012 11:41:01 +0000 (12:41 +0100)
committer sapier <sapier at gmx dot net>
Sun, 5 Feb 2012 11:41:01 +0000 (12:41 +0100)
diff --cc src/content_cao.cpp
Simple merge
diff --cc src/player.cpp
Simple merge
author	sapier <sapier at gmx dot net>
	Sun, 5 Feb 2012 11:41:01 +0000 (12:41 +0100)
committer	sapier <sapier at gmx dot net>
	Sun, 5 Feb 2012 11:41:01 +0000 (12:41 +0100)
		1	2
src/content_cao.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/player.cpp	patch \|	diff1 \|	diff2 \|	blob \| history