Merge branch 'master' into Mario/weaponorder
authorMario <mario.mario@y7mail.com>
Mon, 30 Sep 2019 13:43:56 +0000 (23:43 +1000)
committerMario <mario.mario@y7mail.com>
Mon, 30 Sep 2019 13:43:56 +0000 (23:43 +1000)
commit8e4957c252f8381e37f2a72e227797bf51e5cc2f
tree79157f309a8b1990c31afe2e8183e0f943cf5e88
parentb2713fd3191f8588b87d025408974d0d8293b385
parent4e89b0f36a79a964d87b4bfc449667466e00641d
Merge branch 'master' into Mario/weaponorder
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/defs.qh
qcsrc/client/hud/panel/weapons.qc