]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'terencehill/bot_ai' into 'master'
authorterencehill <piuntn@gmail.com>
Sat, 8 Dec 2018 12:12:33 +0000 (13:12 +0100)
committerterencehill <piuntn@gmail.com>
Sat, 8 Dec 2018 12:14:37 +0000 (13:14 +0100)
1  2 
qcsrc/server/client.qc

Simple merge