]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a845ad7 9246bc4)
Merge branch 'terencehill/bot_waypoints' into 'master'
authorMario <zacjardine@y7mail.com>
Mon, 22 Jan 2018 11:46:06 +0000 (11:46 +0000)
committerMario <zacjardine@y7mail.com>
Mon, 22 Jan 2018 11:46:06 +0000 (11:46 +0000)
bot waypoints

See merge request xonotic/xonotic-maps.pk3dir!108


Trivial merge