Merge branch 'master' into Mario/killsound
authorMario <mario@smbclan.net>
Sun, 12 Mar 2017 03:13:00 +0000 (13:13 +1000)
committerMario <mario@smbclan.net>
Sun, 12 Mar 2017 03:13:00 +0000 (13:13 +1000)
commit905ec2fbd2b610eeb2591cdddbf71ce24b7bb3ab
treeb5b6468afe81751a35e9f7bec52f85a240a473e8
parent599624ecf86d1ca148e2292f16a3b1f7d1010800
parent4d66fbb3a2351be319dd6fc0e481a3dd24e182d4
Merge branch 'master' into Mario/killsound
qcsrc/client/view.qc
qcsrc/common/stats.qh
qcsrc/server/defs.qh
qcsrc/server/g_damage.qc
qcsrc/server/g_world.qc