]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 042df5d 8c10a81)
Merge branch 'terencehill/bot_ai'
authorterencehill <piuntn@gmail.com>
Fri, 8 Mar 2019 16:55:20 +0000 (17:55 +0100)
committerterencehill <piuntn@gmail.com>
Fri, 8 Mar 2019 16:55:20 +0000 (17:55 +0100)

Trivial merge