Merge remote-tracking branch 'origin/upstream'

author Nils Dagsson Moskopp <nils@dieweltistgarnichtso.net>

Sun, 31 Jul 2011 18:04:04 +0000 (20:04 +0200)

committer Nils Dagsson Moskopp <nils@dieweltistgarnichtso.net>

Sun, 31 Jul 2011 18:04:04 +0000 (20:04 +0200)
author Nils Dagsson Moskopp <nils@dieweltistgarnichtso.net>
Sun, 31 Jul 2011 18:04:04 +0000 (20:04 +0200)
committer Nils Dagsson Moskopp <nils@dieweltistgarnichtso.net>
Sun, 31 Jul 2011 18:04:04 +0000 (20:04 +0200)
diff --cc CMakeLists.txt
Simple merge
diff --cc src/CMakeLists.txt
Simple merge
diff --cc src/client.cpp
Simple merge
diff --cc src/main.cpp
Simple merge
diff --cc src/mapnode.h
Simple merge
author	Nils Dagsson Moskopp <nils@dieweltistgarnichtso.net>
	Sun, 31 Jul 2011 18:04:04 +0000 (20:04 +0200)
committer	Nils Dagsson Moskopp <nils@dieweltistgarnichtso.net>
	Sun, 31 Jul 2011 18:04:04 +0000 (20:04 +0200)
		1	2
CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
src/CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
src/client.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/main.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/mapnode.h	patch \|	diff1 \|	diff2 \|	blob \| history