Merge branch 'master' into terencehill/newpanelhud
authorterencehill <piuntn@gmail.com>
Thu, 20 Jan 2011 22:12:55 +0000 (23:12 +0100)
committerterencehill <piuntn@gmail.com>
Thu, 20 Jan 2011 22:12:55 +0000 (23:12 +0100)
commitfc3e13dd48a3e16c4173617475adc240ace548fe
treeb6e7dea2368a51818fefd246c12a9eea53179147
parent5e4c09a4c9fceb1dfe3c71ce7c57580faee9a5f8
parent0209288d556022db3c72b07e25da1d20e00f9337
Merge branch 'master' into terencehill/newpanelhud

Conflicts:
qcsrc/client/Main.qc
qcsrc/client/hud.qc
qcsrc/client/scoreboard.qc
qcsrc/menu/xonotic/dialog_hudpanel_healtharmor.c
qcsrc/menu/xonotic/dialog_hudpanel_powerups.c
qcsrc/menu/xonotic/dialog_hudpanel_score.c
qcsrc/menu/xonotic/dialog_hudpanel_weapons.c
qcsrc/menu/xonotic/dialog_settings_input.c
qcsrc/menu/xonotic/dialog_settings_misc.c

Always a pleasure to resolve conflicts............
19 files changed:
defaultXonotic.cfg
qcsrc/client/Main.qc
qcsrc/client/View.qc
qcsrc/client/autocvars.qh
qcsrc/client/hud.qc
qcsrc/client/hud_config.qc
qcsrc/client/main.qh
qcsrc/client/miscfunctions.qc
qcsrc/client/scoreboard.qc
qcsrc/menu/classes.c
qcsrc/menu/xonotic/dialog_hudpanel_healtharmor.c
qcsrc/menu/xonotic/dialog_hudpanel_powerups.c
qcsrc/menu/xonotic/dialog_hudpanel_score.c
qcsrc/menu/xonotic/dialog_hudpanel_weapons.c
qcsrc/menu/xonotic/dialog_settings_misc.c
qcsrc/menu/xonotic/mainwindow.c
qcsrc/menu/xonotic/util.qc
qcsrc/menu/xonotic/util.qh
qcsrc/server/cl_client.qc