]> 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: 4d66fbb 584cc09)
Merge branch 'Mario/race_target_waypoint' into 'master'
authorMario <zacjardine@y7mail.com>
Sun, 12 Mar 2017 15:36:00 +0000 (15:36 +0000)
committerMario <zacjardine@y7mail.com>
Sun, 12 Mar 2017 15:36:00 +0000 (15:36 +0000)
Merge branch Mario/race_target_waypoint (S merge request)

See merge request !421


Trivial merge