Merge branch 'master' into terencehill/itemstime
authorterencehill <piuntn@gmail.com>
Sat, 26 May 2012 12:50:02 +0000 (14:50 +0200)
committerterencehill <piuntn@gmail.com>
Sat, 26 May 2012 12:50:02 +0000 (14:50 +0200)
commit41e9b002169cd742d5eadd4c540f55164af7f120
treed4d0b454f49c2db45120825a8b4798c90899908d
parentfbcbf08f083a9ab14b947849342f495f05ac9b56
parente55b0af41ff296efc886dfaccf3f663f751f6502
Merge branch 'master' into terencehill/itemstime

Conflicts:
qcsrc/client/hud.qc
qcsrc/menu/xonotic/mainwindow.c
qcsrc/server/t_items.qc
19 files changed:
_hud_common.cfg
_hud_descriptions.cfg
defaultXonotic.cfg
hud_luminos.cfg
hud_luminos_minimal.cfg
hud_luminos_minimal_xhair.cfg
hud_luminos_old.cfg
hud_nexuiz.cfg
qcsrc/client/autocvars.qh
qcsrc/client/hud.qc
qcsrc/client/hud_config.qc
qcsrc/common/constants.qh
qcsrc/common/util.qh
qcsrc/menu/classes.c
qcsrc/menu/xonotic/mainwindow.c
qcsrc/server/cl_client.qc
qcsrc/server/defs.qh
qcsrc/server/g_world.qc
qcsrc/server/t_items.qc