Merge remote-tracking branch 'origin/master' into terencehill/clear_button
authorSamual Lenks <samual@xonotic.org>
Wed, 8 May 2013 00:24:09 +0000 (20:24 -0400)
committerSamual Lenks <samual@xonotic.org>
Wed, 8 May 2013 00:24:09 +0000 (20:24 -0400)
1  2 
qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c
qcsrc/menu/xonotic/inputbox.c

Simple merge