Merge branch 'master' into Mario/entcs
authorMario <mario@smbclan.net>
Sun, 21 Aug 2016 08:01:06 +0000 (18:01 +1000)
committerMario <mario@smbclan.net>
Sun, 21 Aug 2016 08:01:06 +0000 (18:01 +1000)
commitf34fd47ee0a7f283ab60592a17399ec5a500416c
tree628e8cab16eff9e6ac6519dbe1944c05e6fafe95
parent6cb6858aba996eda91792becb2a7caa94a0f8141
parent06ac66a5edaa645e19ed9a6482409e8656a65b1d
Merge branch 'master' into Mario/entcs
qcsrc/client/_all.qh
qcsrc/client/hud/hud.qc
qcsrc/client/hud/hud.qh
qcsrc/client/view.qc
qcsrc/common/weapons/weapon/arc.qc
qcsrc/common/weapons/weapon/vaporizer.qc
qcsrc/server/teamplay.qc