]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into terencehill/bot_fix
authorterencehill <piuntn@gmail.com>
Thu, 29 Dec 2016 01:59:28 +0000 (02:59 +0100)
committerterencehill <piuntn@gmail.com>
Thu, 29 Dec 2016 01:59:28 +0000 (02:59 +0100)
1  2 
qcsrc/common/t_items.qc
qcsrc/server/bot/default/havocbot/havocbot.qc
qcsrc/server/bot/default/navigation.qc

Simple merge