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

projects / oweals / minetest.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 0947644 ffe6025)

author	sapier <sapier at gmx dot net>
	Sun, 5 Feb 2012 19:35:54 +0000 (20:35 +0100)
committer	sapier <sapier at gmx dot net>
	Sun, 5 Feb 2012 19:35:54 +0000 (20:35 +0100)
commit	413afa77d0e168a0a652c7437cf8179a0569cb89
tree	6ddbfe1f37be9f3a99bb8823f301a6500addc74b	tree \| snapshot
parent	09476447297a35f04b0bd89dddafbadcbb96f83d	commit \| diff
parent	ffe6025f610b03100af10b8d4b248494deb0c1fa	commit \| diff

Merge branch 'object_object_collision' into sapier_experimental

src/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
src/content_cao.cpp	diff1 \|	diff2 \|	blob \| history
src/content_sao.cpp	diff1 \|	diff2 \|	blob \| history
src/environment.cpp	diff1 \|	diff2 \|	blob \| history
src/environment.h	diff1 \|	diff2 \|	blob \| history
src/scriptapi.cpp	diff1 \|	diff2 \|	blob \| history

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