Merge branch 'master' into terencehill/bot_waypoints

author terencehill <piuntn@gmail.com>

Mon, 17 Jul 2017 22:23:08 +0000 (00:23 +0200)

committer terencehill <piuntn@gmail.com>

Mon, 17 Jul 2017 22:23:08 +0000 (00:23 +0200)
author terencehill <piuntn@gmail.com>
Mon, 17 Jul 2017 22:23:08 +0000 (00:23 +0200)
committer terencehill <piuntn@gmail.com>
Mon, 17 Jul 2017 22:23:08 +0000 (00:23 +0200)
diff --cc qcsrc/server/bot/default/bot.qc
Simple merge
diff --cc qcsrc/server/bot/default/havocbot/havocbot.qc
Simple merge
diff --cc qcsrc/server/command/sv_cmd.qc
Simple merge
diff --cc qcsrc/server/impulse.qc
Simple merge
author	terencehill <piuntn@gmail.com>
	Mon, 17 Jul 2017 22:23:08 +0000 (00:23 +0200)
committer	terencehill <piuntn@gmail.com>
	Mon, 17 Jul 2017 22:23:08 +0000 (00:23 +0200)
		1	2
qcsrc/server/bot/default/bot.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/server/bot/default/havocbot/havocbot.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/server/command/sv_cmd.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/server/impulse.qc	patch \|	diff1 \|	diff2 \|	blob \| history