Merge branch 'upstream/master'
authorNils Dagsson Moskopp <nils@dieweltistgarnichtso.net>
Sat, 30 Jul 2011 17:46:55 +0000 (19:46 +0200)
committerNils Dagsson Moskopp <nils@dieweltistgarnichtso.net>
Sat, 30 Jul 2011 17:47:55 +0000 (19:47 +0200)
commit96bee29e35f0790657fbd8bb67d2af79b498255c
tree0712c75629ab16fad84af11050ef94d8c8ac8137
parent82ea53499710c9a4e92ec595d8c14c417bdd0ee6
parentf2051c98223d087c8ba3d7e4514935781c93ed1c
Merge branch 'upstream/master'
CMakeLists.txt
src/client.cpp
src/guiPauseMenu.cpp
src/main.cpp
src/servermain.cpp