]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into terencehill/bot_AI_improvements
authorterencehill <piuntn@gmail.com>
Mon, 13 Feb 2017 21:28:26 +0000 (22:28 +0100)
committerterencehill <piuntn@gmail.com>
Mon, 13 Feb 2017 21:28:26 +0000 (22:28 +0100)
1  2 
qcsrc/common/t_items.qc

Simple merge