Merge branch 'master' into terencehill/bot_fix

author terencehill <piuntn@gmail.com>

Thu, 29 Dec 2016 01:59:28 +0000 (02:59 +0100)

committer terencehill <piuntn@gmail.com>

Thu, 29 Dec 2016 01:59:28 +0000 (02:59 +0100)
author terencehill <piuntn@gmail.com>
Thu, 29 Dec 2016 01:59:28 +0000 (02:59 +0100)
committer terencehill <piuntn@gmail.com>
Thu, 29 Dec 2016 01:59:28 +0000 (02:59 +0100)
diff --cc qcsrc/common/t_items.qc
Simple merge
diff --cc qcsrc/server/bot/default/havocbot/havocbot.qc
Simple merge
diff --cc qcsrc/server/bot/default/navigation.qc
Simple merge
author	terencehill <piuntn@gmail.com>
	Thu, 29 Dec 2016 01:59:28 +0000 (02:59 +0100)
committer	terencehill <piuntn@gmail.com>
	Thu, 29 Dec 2016 01:59:28 +0000 (02:59 +0100)
		1	2
qcsrc/common/t_items.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/server/bot/default/havocbot/havocbot.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/server/bot/default/navigation.qc	patch \|	diff1 \|	diff2 \|	blob \| history