Merge branch 'terencehill/screenshot_viewer' into terencehill/player_model_zoom

author terencehill <piuntn@gmail.com>

Sun, 3 Jun 2012 10:32:24 +0000 (12:32 +0200)

committer terencehill <piuntn@gmail.com>

Sun, 3 Jun 2012 10:32:24 +0000 (12:32 +0200)
author terencehill <piuntn@gmail.com>
Sun, 3 Jun 2012 10:32:24 +0000 (12:32 +0200)
committer terencehill <piuntn@gmail.com>
Sun, 3 Jun 2012 10:32:24 +0000 (12:32 +0200)
diff --cc qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c
Simple merge
author	terencehill <piuntn@gmail.com>
	Sun, 3 Jun 2012 10:32:24 +0000 (12:32 +0200)
committer	terencehill <piuntn@gmail.com>
	Sun, 3 Jun 2012 10:32:24 +0000 (12:32 +0200)