]> 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: 16225fa 0d0a202)
Merge branch 'Mario/campaign_mapinfo_fix_v2' into 'master'
authorMario <mario.mario@y7mail.com>
Mon, 30 Sep 2019 13:34:56 +0000 (13:34 +0000)
committerMario <mario.mario@y7mail.com>
Mon, 30 Sep 2019 13:34:56 +0000 (13:34 +0000)
Merge branch Mario/campaign_mapinfo_fix_v2 (S merge request)

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


Trivial merge