Merge branch 'master' into terencehill/bot_ai

author terencehill <piuntn@gmail.com>

Sun, 3 Mar 2019 11:15:00 +0000 (12:15 +0100)

committer terencehill <piuntn@gmail.com>

Sun, 3 Mar 2019 11:15:00 +0000 (12:15 +0100)
author terencehill <piuntn@gmail.com>
Sun, 3 Mar 2019 11:15:00 +0000 (12:15 +0100)
committer terencehill <piuntn@gmail.com>
Sun, 3 Mar 2019 11:15:00 +0000 (12:15 +0100)
diff --cc qcsrc/server/bot/default/havocbot/havocbot.qc
Simple merge
diff --cc qcsrc/server/bot/default/navigation.qc
Simple merge
diff --cc xonotic-server.cfg
Simple merge
author	terencehill <piuntn@gmail.com>
	Sun, 3 Mar 2019 11:15:00 +0000 (12:15 +0100)
committer	terencehill <piuntn@gmail.com>
	Sun, 3 Mar 2019 11:15:00 +0000 (12:15 +0100)
		1	2
qcsrc/server/bot/default/havocbot/havocbot.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/server/bot/default/navigation.qc	patch \|	diff1 \|	diff2 \|	blob \| history
xonotic-server.cfg	patch \|	diff1 \|	diff2 \|	blob \| history