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

projects / oweals / minetest.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 3454e67 a1eb283)

author	sapier <sapier at gmx dot net>
	Sat, 4 Feb 2012 11:41:25 +0000 (12:41 +0100)
committer	sapier <sapier at gmx dot net>
	Sat, 4 Feb 2012 11:41:25 +0000 (12:41 +0100)
commit	77df09540c4d7eadef760779e123af88a48aafaa
tree	febf1009328d30c31a14a1a1ca1600e99b4c3e6b	tree \| snapshot
parent	3454e6779337d8523ae76c7fa16eb8c565aa2381	commit \| diff
parent	a1eb2836c0764829ebad1462432bb3c5f32750df	commit \| diff

Merge remote branch 'upstream/master' into sapier_experimental

Conflicts:
src/scriptapi.cpp

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/mesh.cpp	diff1 \|	diff2 \|	blob \| history
src/mesh.h	diff1 \|	diff2 \|	blob \| history
src/scriptapi.cpp	diff1 \|	diff2 \|	blob \| history
src/serverobject.cpp	diff1 \|	diff2 \|	blob \| history
src/serverobject.h	diff1 \|	diff2 \|	blob \| history

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