Merge branch 'master' into Mario/weaponentities

author Mario <mario@smbclan.net>

Mon, 8 Aug 2016 11:17:16 +0000 (21:17 +1000)

committer Mario <mario@smbclan.net>

Mon, 8 Aug 2016 11:17:16 +0000 (21:17 +1000)
author Mario <mario@smbclan.net>
Mon, 8 Aug 2016 11:17:16 +0000 (21:17 +1000)
committer Mario <mario@smbclan.net>
Mon, 8 Aug 2016 11:17:16 +0000 (21:17 +1000)
diff --cc qcsrc/common/weapons/weapon/shockwave.qc
Simple merge
diff --cc qcsrc/common/weapons/weapon/shotgun.qc
Simple merge
diff --cc qcsrc/server/cl_client.qc
Simple merge
author	Mario <mario@smbclan.net>
	Mon, 8 Aug 2016 11:17:16 +0000 (21:17 +1000)
committer	Mario <mario@smbclan.net>
	Mon, 8 Aug 2016 11:17:16 +0000 (21:17 +1000)
		1	2
qcsrc/common/weapons/weapon/shockwave.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/shotgun.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/server/cl_client.qc	patch \|	diff1 \|	diff2 \|	blob \| history