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

projects / oweals / minetest.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 90d793f 976ec31)

author	Perttu Ahola <celeron55@gmail.com>
	Sat, 23 Jul 2011 16:04:37 +0000 (19:04 +0300)
committer	Perttu Ahola <celeron55@gmail.com>
	Sat, 23 Jul 2011 16:04:37 +0000 (19:04 +0300)
commit	2587bb361cfc96b3a695d1476e39b9c0ecaa6553
tree	6e6a35e0ee35883201189df9c545cc44b7a06658	tree \| snapshot
parent	90d793f8f369bf1431d7a915198cd49b98bbe2d7	commit \| diff
parent	976ec31c1faedc3a34935c3aafd6a868e222d1ad	commit \| diff

merged the content type extension and delta

src/content_craft.cpp	diff1 \|	diff2 \|	blob \| history
src/content_inventory.cpp	diff1 \|	diff2 \|	blob \| history
src/content_mapblock.cpp	diff1 \|	diff2 \|	blob \| history
src/content_mapnode.cpp	diff1 \|	diff2 \|	blob \| history
src/content_mapnode.h	diff1 \|	diff2 \|	blob \| history
src/environment.cpp	diff1 \|	diff2 \|	blob \| history
src/game.cpp	diff1 \|	diff2 \|	blob \| history
src/main.cpp	diff1 \|	diff2 \|	blob \| history
src/map.cpp	diff1 \|	diff2 \|	blob \| history
src/mapgen.cpp	diff1 \|	diff2 \|	blob \| history
src/mapnode.h	diff1 \|	diff2 \|	blob \| history

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