Merge branch 'master' into terencehill/itemstime
authorterencehill <piuntn@gmail.com>
Thu, 5 Jan 2012 20:10:59 +0000 (21:10 +0100)
committerterencehill <piuntn@gmail.com>
Thu, 5 Jan 2012 20:10:59 +0000 (21:10 +0100)
commit6e0ac89b3f58dbf7d1b0edc7e62968b5841ee59c
tree5148118e44a4e40508371587ed4abd3a8fc8fc4e
parent7063233875c5c0612887ca7b231d4129e4a2aa7c
parent1b8067ffcc792adb987ffdd1a94a9cd834882c7b
Merge branch 'master' into terencehill/itemstime
_hud_descriptions.cfg
defaultXonotic.cfg
qcsrc/client/autocvars.qh
qcsrc/client/hud.qc
qcsrc/common/constants.qh
qcsrc/common/util.qh
qcsrc/server/cl_client.qc
qcsrc/server/defs.qh
qcsrc/server/g_world.qc