Merge branch 'master' into terencehill/clear_button
authorterencehill <piuntn@gmail.com>
Wed, 25 Jan 2012 17:14:40 +0000 (18:14 +0100)
committerterencehill <piuntn@gmail.com>
Wed, 25 Jan 2012 17:14:40 +0000 (18:14 +0100)
commit1c2bdc1f0012349f80906e05902ce19bed35be16
tree3c511c7c0b81221853822b5930d5fd15490c2bce
parentcb4df1ba5071345cce0e83a50196a5f5cb852d79
parent7bb5df2b06fef28adb124bcd9a83e9ee3d993c71
Merge branch 'master' into terencehill/clear_button
gfx/menu/luminos/skinvalues.txt
gfx/menu/wickedx/skinvalues.txt
gfx/menu/xaw/skinvalues.txt
qcsrc/menu/skin-customizables.inc
qcsrc/menu/xonotic/dialog_multiplayer_demo.c
qcsrc/menu/xonotic/dialog_multiplayer_join.c
qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c
qcsrc/menu/xonotic/dialog_settings_network.c