]> git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/commit
Merge branch 'Mirio/opium' into 'master' 135/merge
authorMirio <opivy@hotmail.de>
Fri, 17 Jun 2022 08:48:31 +0000 (08:48 +0000)
committerMirio <opivy@hotmail.de>
Fri, 17 Jun 2022 08:48:31 +0000 (08:48 +0000)
commit96487c66ae4b6a036a893d2c73991ee0445654bc
treeb1925069c11afa8a19430844ce34cdc54b01612e
parent12eb5dad144eb8c1921c0ec15325ef6516930dea
parent686a21cb6d284fd38b7760b129de1d0c2535be2d
Merge branch 'Mirio/opium' into 'master'

Mirio/opium

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