Merge branch 'master' into terencehill/clear_button
authorterencehill <piuntn@gmail.com>
Wed, 13 Jun 2012 11:41:57 +0000 (13:41 +0200)
committerterencehill <piuntn@gmail.com>
Wed, 13 Jun 2012 11:41:57 +0000 (13:41 +0200)
commit7cf65fc959abac34d7791793d8d10e091416df2f
tree6c066fbe5252e9d1c15cbafc469307f520c3d1b6
parentd66f380dbf82446731651878daae59c644dac3d8
parent71a5c6a7cf9442fc504038825a5cb94ff4355150
Merge branch 'master' into terencehill/clear_button
qcsrc/menu/item/inputbox.c
qcsrc/menu/skin-customizables.inc
qcsrc/menu/xonotic/dialog_multiplayer_demo.c
qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c
qcsrc/menu/xonotic/dialog_settings_misc.c
qcsrc/menu/xonotic/dialog_settings_misc_cvars.c