Merge remote-tracking branch 'marktraceur/master'

author Perttu Ahola <celeron55@gmail.com>

Mon, 26 Sep 2011 19:41:06 +0000 (22:41 +0300)

committer Perttu Ahola <celeron55@gmail.com>

Mon, 26 Sep 2011 19:41:06 +0000 (22:41 +0300)
author Perttu Ahola <celeron55@gmail.com>
Mon, 26 Sep 2011 19:41:06 +0000 (22:41 +0300)
committer Perttu Ahola <celeron55@gmail.com>
Mon, 26 Sep 2011 19:41:06 +0000 (22:41 +0300)
diff --cc src/content_mapnode.cpp
Simple merge
diff --cc src/content_mapnode.h
Simple merge
diff --cc src/environment.cpp
Simple merge
diff --cc src/map.cpp
Simple merge
diff --cc src/mapnode.h
Simple merge
diff --cc src/server.cpp
Simple merge
author	Perttu Ahola <celeron55@gmail.com>
	Mon, 26 Sep 2011 19:41:06 +0000 (22:41 +0300)
committer	Perttu Ahola <celeron55@gmail.com>
	Mon, 26 Sep 2011 19:41:06 +0000 (22:41 +0300)
		1	2
src/content_mapnode.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/content_mapnode.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/environment.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/map.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/mapnode.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/server.cpp	patch \|	diff1 \|	diff2 \|	blob \| history