]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
Merge branch 'Mirio/opium' into 'master'
authorSpiKe <leguen.yannick@gmail.com>
Fri, 17 Jun 2022 08:50:46 +0000 (08:50 +0000)
committerSpiKe <leguen.yannick@gmail.com>
Fri, 17 Jun 2022 08:50:46 +0000 (08:50 +0000)
Mirio/opium

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

1  2 
scripts/shaderlist.txt

Simple merge