Merge branch 'master' into Mario/killsound

author Mario <mario@smbclan.net>

Sat, 24 Dec 2016 08:46:10 +0000 (18:46 +1000)

committer Mario <mario@smbclan.net>

Sat, 24 Dec 2016 08:46:10 +0000 (18:46 +1000)
author Mario <mario@smbclan.net>
Sat, 24 Dec 2016 08:46:10 +0000 (18:46 +1000)
committer Mario <mario@smbclan.net>
Sat, 24 Dec 2016 08:46:10 +0000 (18:46 +1000)
diff --cc qcsrc/client/view.qc
Simple merge
diff --cc qcsrc/common/sounds/all.inc
Simple merge
diff --cc qcsrc/common/stats.qh
Simple merge
diff --cc qcsrc/server/defs.qh
Simple merge
diff --cc qcsrc/server/g_world.qc
Simple merge
author	Mario <mario@smbclan.net>
	Sat, 24 Dec 2016 08:46:10 +0000 (18:46 +1000)
committer	Mario <mario@smbclan.net>
	Sat, 24 Dec 2016 08:46:10 +0000 (18:46 +1000)
		1	2
qcsrc/client/view.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/common/sounds/all.inc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/common/stats.qh	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/server/defs.qh	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/server/g_world.qc	patch \|	diff1 \|	diff2 \|	blob \| history