Merge branch 'master' into sev/luma_revisions
authorSeverin Meyer <sev.ch@web.de>
Sun, 2 Aug 2015 09:40:58 +0000 (11:40 +0200)
committerSeverin Meyer <sev.ch@web.de>
Sun, 2 Aug 2015 09:40:58 +0000 (11:40 +0200)
commit98e1375c9938f3d86d6f8e28f44cd6af74d2fc0e
tree395fed8c698bbdb662a6f6977bc5d159f426f76e
parent0bb8fc5dc3fff725c7cf178c1535dd77db89a54b
parentd643a85365a46cde125ddcdc5834bbfee9dbc532
Merge branch 'master' into sev/luma_revisions
_hud_descriptions.cfg
hud_luma.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