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)
commit2be39968eee26eaafc1099e9d72ccb2066b8414e
tree8832ae25f3bb60173609921577e5e5ee9e5f6b71
parent08000124aa049edef5ee12968d402dd56be93f94
parentc4642928dead2ea338554f1db1a3024809d01272
Merge remote-tracking branch 'origin/master' into terencehill/clear_button
qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c
qcsrc/menu/xonotic/inputbox.c