Merge branch 'master' into Mario/killsound
authorMario <mario@smbclan.net>
Sat, 24 Dec 2016 08:46:10 +0000 (18:46 +1000)
committerMario <mario@smbclan.net>
Sat, 24 Dec 2016 08:46:10 +0000 (18:46 +1000)
1  2 
qcsrc/client/view.qc
qcsrc/common/sounds/all.inc
qcsrc/common/stats.qh
qcsrc/server/defs.qh
qcsrc/server/g_world.qc

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge