]> git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/commit
Merge master, resolve a merge conflict
authorSpike29 <leguen.yannick@gmail.com>
Fri, 28 Jan 2022 17:49:20 +0000 (18:49 +0100)
committerSpike29 <leguen.yannick@gmail.com>
Fri, 28 Jan 2022 17:49:20 +0000 (18:49 +0100)
commit63689530d7a087d84ef671e295110f8128bb95d0
treec45ba1d63076dbb7ef290afea235377dec49611e
parentc5ef5628597f8a46a28c5f19cf8b81afcd9a7840
parent3bb5f5f4c9b02561acc067724d21b2e1f04561ca
Merge master, resolve a merge conflict
scripts/map_erbium.shader