]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c2f067f 38c2e33)
Merge branch 'terencehill/bot_waypoints' into 'master'
authorMario <zacjardine@y7mail.com>
Wed, 25 Apr 2018 13:08:48 +0000 (13:08 +0000)
committerMario <zacjardine@y7mail.com>
Wed, 25 Apr 2018 13:08:48 +0000 (13:08 +0000)
bot waypoints

See merge request xonotic/xonotic-data.pk3dir!553


Trivial merge