]> git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/commit
Merge master and resolve merge conflicts
authorSpike29 <leguen.yannick@gmail.com>
Sun, 2 Jan 2022 12:09:41 +0000 (13:09 +0100)
committerSpike29 <leguen.yannick@gmail.com>
Sun, 2 Jan 2022 12:09:41 +0000 (13:09 +0100)
commitcb2c3e4257b1365f1af0dc462be61566a2330dce
tree4f972899d5e4c0fff7c3cde120b9b6cbf6728c9c
parent5a92e9997d028e391fb95ccc7298dcbf18d0dd15
parent1c0c1f476149048e3d4af88ad99eb241b9d92122
Merge master and resolve merge conflicts
maps/erbium.map
maps/erbium.mapinfo