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)
1  2 
_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

Simple merge
diff --cc hud_luma.cfg
Simple merge
diff --cc hud_luminos.cfg
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc hud_nexuiz.cfg
Simple merge
Simple merge
Simple merge