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

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge