81.2.79.47 Git - zefram/minetest/minetest_engine.git/commit

projects / zefram / minetest / minetest_engine.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 9b5f182 b90e431)

author	kwolekr <mirrorisim@gmail.com>
	Tue, 26 Feb 2013 04:52:24 +0000 (20:52 -0800)
committer	kwolekr <mirrorisim@gmail.com>
	Tue, 26 Feb 2013 04:52:24 +0000 (20:52 -0800)
commit	979ca23f1eae1adeb8b0083dffe7203c54d87395
tree	689ce00fbfe55861f4df39e1801fc9bc990b141f	tree \| snapshot
parent	9b5f182642416add39aab7782b1d155dafead160	commit \| diff
parent	b90e431fc785961e7913023999d1f570ad7ca151	commit \| diff

Merge pull request #482 from proller/liquid

finite liquid

src/content_abm.cpp	diff1 \|	diff2 \|	blob \| history
src/content_mapblock.cpp	diff1 \|	diff2 \|	blob \| history
src/defaultsettings.cpp	diff1 \|	diff2 \|	blob \| history
src/map.cpp	diff1 \|	diff2 \|	blob \| history
src/map.h	diff1 \|	diff2 \|	blob \| history
src/mapnode.h	diff1 \|	diff2 \|	blob \| history
src/server.cpp	diff1 \|	diff2 \|	blob \| history
src/server.h	diff1 \|	diff2 \|	blob \| history

Minetest engine