]> de.git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/commit - scripts/map_erbium.shader
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)
commit034d4e842a5b487ea44458dd211b0dddfc252d4b
treeb1925069c11afa8a19430844ce34cdc54b01612e
parent12eb5dad144eb8c1921c0ec15325ef6516930dea
parent32a6e74e8d81e01a7339a034fdb8e2a32e734be7
Merge branch 'Mirio/opium' into 'master'

Mirio/opium

See merge request xonotic/xonotic-maps.pk3dir!135
scripts/shaderlist.txt