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)
commitb4cde52de1bde884b6900277989abfb1c93d1bd4
treec49a219aa06ded6b8d610bc66df5bb83161584bd
parent47288e2ea87a2c0c835e5be46e8f009a00e870d8
parent36051387f971e6a4e90d562f4cd6b48d949b61f8
Merge branch 'master' into Mario/killsound
qcsrc/client/view.qc
qcsrc/common/sounds/all.inc
qcsrc/common/stats.qh
qcsrc/server/defs.qh
qcsrc/server/g_world.qc