]> 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: 242f8fc cf09114)
Merge branch 'Mario/vehicles' into 'master'
authorMario <zacjardine@y7mail.com>
Fri, 21 Aug 2015 10:31:19 +0000 (10:31 +0000)
committerMario <zacjardine@y7mail.com>
Fri, 21 Aug 2015 10:31:19 +0000 (10:31 +0000)
Merge branch Mario/vehicles (XXL merge request)

Good luck, TimePath.

See merge request !189


Trivial merge