Merge branch 'view_bobbing_and_vielded_tool'

author Perttu Ahola <celeron55@gmail.com>

Mon, 26 Sep 2011 12:10:02 +0000 (15:10 +0300)

committer Perttu Ahola <celeron55@gmail.com>

Mon, 26 Sep 2011 12:10:02 +0000 (15:10 +0300)
author Perttu Ahola <celeron55@gmail.com>
Mon, 26 Sep 2011 12:10:02 +0000 (15:10 +0300)
committer Perttu Ahola <celeron55@gmail.com>
Mon, 26 Sep 2011 12:10:02 +0000 (15:10 +0300)
diff --cc src/CMakeLists.txt
Simple merge
diff --cc src/client.cpp
Simple merge
diff --cc src/content_mapnode.cpp
Simple merge
diff --cc src/defaultsettings.cpp
Simple merge
diff --cc src/environment.cpp
Simple merge
diff --cc src/map.cpp
Simple merge
diff --cc src/map.h
Simple merge
diff --cc src/server.cpp
Simple merge
author	Perttu Ahola <celeron55@gmail.com>
	Mon, 26 Sep 2011 12:10:02 +0000 (15:10 +0300)
committer	Perttu Ahola <celeron55@gmail.com>
	Mon, 26 Sep 2011 12:10:02 +0000 (15:10 +0300)
		1	2
src/CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
src/client.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/content_mapnode.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/defaultsettings.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/environment.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/map.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/map.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/server.cpp	patch \|	diff1 \|	diff2 \|	blob \| history