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)
1  2 
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

Simple merge
Simple merge