Merge branch 'master' into Mario/monsters

author Mario <mario@smbclan.net>

Mon, 23 Apr 2018 16:16:41 +0000 (02:16 +1000)

committer Mario <mario@smbclan.net>

Mon, 23 Apr 2018 16:16:41 +0000 (02:16 +1000)
author Mario <mario@smbclan.net>
Mon, 23 Apr 2018 16:16:41 +0000 (02:16 +1000)
committer Mario <mario@smbclan.net>
Mon, 23 Apr 2018 16:16:41 +0000 (02:16 +1000)
diff --cc qcsrc/common/monsters/monster/mage.qc
Simple merge
diff --cc qcsrc/common/monsters/monster/wyvern.qc
Simple merge
diff --cc qcsrc/common/monsters/sv_monsters.qc
Simple merge
diff --cc qcsrc/menu/xonotic/util.qc
Simple merge
diff --cc qcsrc/server/autocvars.qh
Simple merge
author	Mario <mario@smbclan.net>
	Mon, 23 Apr 2018 16:16:41 +0000 (02:16 +1000)
committer	Mario <mario@smbclan.net>
	Mon, 23 Apr 2018 16:16:41 +0000 (02:16 +1000)
		1	2
qcsrc/common/monsters/monster/mage.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/common/monsters/monster/wyvern.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/common/monsters/sv_monsters.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/menu/xonotic/util.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/server/autocvars.qh	patch \|	diff1 \|	diff2 \|	blob \| history