Merge branch 'master' into Mario/monsters

author Mario <mario@smbclan.net>

Sat, 3 Feb 2018 15:45:20 +0000 (01:45 +1000)

committer Mario <mario@smbclan.net>

Sat, 3 Feb 2018 15:45:20 +0000 (01:45 +1000)
author Mario <mario@smbclan.net>
Sat, 3 Feb 2018 15:45:20 +0000 (01:45 +1000)
committer Mario <mario@smbclan.net>
Sat, 3 Feb 2018 15:45:20 +0000 (01:45 +1000)
diff --cc qcsrc/common/monsters/sv_monsters.qc
Simple merge
diff --cc qcsrc/common/triggers/func/breakable.qc
Simple merge
diff --cc qcsrc/server/autocvars.qh
Simple merge
author	Mario <mario@smbclan.net>
	Sat, 3 Feb 2018 15:45:20 +0000 (01:45 +1000)
committer	Mario <mario@smbclan.net>
	Sat, 3 Feb 2018 15:45:20 +0000 (01:45 +1000)
		1	2
qcsrc/common/monsters/sv_monsters.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/common/triggers/func/breakable.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/server/autocvars.qh	patch \|	diff1 \|	diff2 \|	blob \| history