]> 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: 8121bbc 8f81c01)
Merge branch 'Mario/invasion_types' into 'master'
authorMario <zacjardine@y7mail.com>
Sat, 26 Aug 2017 16:04:07 +0000 (16:04 +0000)
committerMario <zacjardine@y7mail.com>
Sat, 26 Aug 2017 16:04:07 +0000 (16:04 +0000)
Merge branch Mario/invasion_types (M merge request)

See merge request !471


Trivial merge