Merge branch 'master' into terencehill/menu_dialogs_cleanups
authorterencehill <piuntn@gmail.com>
Thu, 20 Jan 2011 20:37:11 +0000 (21:37 +0100)
committerterencehill <piuntn@gmail.com>
Thu, 20 Jan 2011 20:37:11 +0000 (21:37 +0100)
commit8b5335b125ddeb8a0c023ff5cf7f5f28f034f4e3
treebb230d872ae9a3faea2474b826d88f491bd7114e
parent147621be389ef0cae4d230a6c3c119af601448e4
parent0209288d556022db3c72b07e25da1d20e00f9337
Merge branch 'master' into terencehill/menu_dialogs_cleanups

Conflicts:
qcsrc/menu/xonotic/dialog_multiplayer_playersetup_waypoint.c
qcsrc/menu/xonotic/dialog_multiplayer_playersetup_weapons.c
qcsrc/menu/xonotic/dialog_settings_effects.c
qcsrc/menu/skin-customizables.inc
qcsrc/menu/xonotic/dialog_multiplayer_playersetup_waypoint.c
qcsrc/menu/xonotic/dialog_multiplayer_playersetup_weapons.c
qcsrc/menu/xonotic/dialog_settings_effects.c