Merge branch 'upstream/master'

author Nils Dagsson Moskopp <nils@dieweltistgarnichtso.net>

Sat, 30 Jul 2011 17:46:55 +0000 (19:46 +0200)

committer Nils Dagsson Moskopp <nils@dieweltistgarnichtso.net>

Sat, 30 Jul 2011 17:47:55 +0000 (19:47 +0200)
author Nils Dagsson Moskopp <nils@dieweltistgarnichtso.net>
Sat, 30 Jul 2011 17:46:55 +0000 (19:46 +0200)
committer Nils Dagsson Moskopp <nils@dieweltistgarnichtso.net>
Sat, 30 Jul 2011 17:47:55 +0000 (19:47 +0200)
diff --cc CMakeLists.txt
Simple merge
diff --cc src/client.cpp
Simple merge
diff --cc src/guiPauseMenu.cpp
Simple merge
diff --cc src/main.cpp
Simple merge
diff --cc src/servermain.cpp
Simple merge
author	Nils Dagsson Moskopp <nils@dieweltistgarnichtso.net>
	Sat, 30 Jul 2011 17:46:55 +0000 (19:46 +0200)
committer	Nils Dagsson Moskopp <nils@dieweltistgarnichtso.net>
	Sat, 30 Jul 2011 17:47:55 +0000 (19:47 +0200)
		1	2
CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
src/client.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/guiPauseMenu.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/main.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/servermain.cpp	patch \|	diff1 \|	diff2 \|	blob \| history