]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit - input-rtlights.cfg
Merge branch 'master' into terencehill/hud_code_cleanup
authorterencehill <piuntn@gmail.com>
Mon, 6 Jan 2014 00:07:02 +0000 (01:07 +0100)
committerterencehill <piuntn@gmail.com>
Mon, 6 Jan 2014 00:07:02 +0000 (01:07 +0100)
commitd83e03a366494037c020f4cebf474325de88e69e
tree8356f6455173b8aefdeff990c43889ad12763895
parent52b68cb65b8c40a9363e67eaef7f1eca80bd56cf
parente23579dcf3caf46f7d186bfc4b641458b36b5365
Merge branch 'master' into terencehill/hud_code_cleanup

Conflicts:
qcsrc/client/hud.qc
qcsrc/client/hud.qh
qcsrc/common/items.qh
qcsrc/client/Main.qc
qcsrc/client/View.qc
qcsrc/client/autocvars.qh
qcsrc/client/csqcmodel_hooks.qc
qcsrc/client/hud.qc
qcsrc/client/hud.qh
qcsrc/client/hud_config.qc
qcsrc/client/miscfunctions.qc
qcsrc/client/scoreboard.qc
qcsrc/common/items.qh