git.librecmc.org Git - oweals/minetest.git/commit

projects / oweals / minetest.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 88cdd3a 6bf4931)

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)
commit	8929a47296b79bb8e29bd292c2474ecbaf54b9f1
tree	065608d5e4e410652a1ffca5dfd73b7b82d6873e	tree \| snapshot
parent	88cdd3a363668cfb2fd07b5381cce29738aed0bf	commit \| diff
parent	6bf4931fc28c85053acdbb2e08261d2290583ea4	commit \| diff

Merge remote branch 'upstream_kahrl/collision_allow_stairs_v2' into object_object_collision

src/content_cao.cpp	diff1 \|	diff2 \|	blob \| history
src/player.cpp	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.