]> 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: fc0889b 20217f7)
Merge branch 'Mario/wepgroup_switch' into 'master'
authorMario <zacjardine@y7mail.com>
Wed, 17 Oct 2018 14:55:39 +0000 (14:55 +0000)
committerMario <zacjardine@y7mail.com>
Wed, 17 Oct 2018 14:55:39 +0000 (14:55 +0000)
Merge branch Mario/wepgroup_switch

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


Trivial merge