Merge branch 'master' into terencehill/clear_button
authorterencehill <piuntn@gmail.com>
Thu, 26 Jan 2012 19:19:03 +0000 (20:19 +0100)
committerterencehill <piuntn@gmail.com>
Thu, 26 Jan 2012 19:24:48 +0000 (20:24 +0100)
commit2bfd748e228cc992041a15827d3f126916efed22
tree67e2653611d6cd32a19ccca899e4d0fbd561c2d9
parent193544f61c32c5e71cfc83799848f0e6e10b92b2
parent767442ecf43244d0cf0a72f05d500bee7f521ea9
Merge branch 'master' into terencehill/clear_button

Conflicts:
qcsrc/menu/item/inputbox.c
qcsrc/menu/xonotic/dialog_multiplayer_demo.c
qcsrc/menu/xonotic/dialog_settings_misc_cvars.c
qcsrc/menu/xonotic/dialog_settings_network.c
gfx/menu/luminos/skinvalues.txt
gfx/menu/wickedx/skinvalues.txt
gfx/menu/xaw/skinvalues.txt
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