]> git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 034d4e8 ca3038d)
Merge branch 'Spike29/campaign_update' into 'master'
authorSpiKe <leguen.yannick@gmail.com>
Fri, 17 Jun 2022 08:53:36 +0000 (08:53 +0000)
committerSpiKe <leguen.yannick@gmail.com>
Fri, 17 Jun 2022 08:53:36 +0000 (08:53 +0000)
Campaign: Replace the Drain and Oilrig levels with Opium and Bromine

Closes #203

See merge request xonotic/xonotic-maps.pk3dir!158


Trivial merge