]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 36e219f 6d57adc)
Merge branch 'terencehill/frozen_resurfacing' into 'master'
authorMario <mario.mario@y7mail.com>
Sun, 24 May 2020 11:41:02 +0000 (11:41 +0000)
committerMario <mario.mario@y7mail.com>
Sun, 24 May 2020 11:41:02 +0000 (11:41 +0000)
Frozen resurfacing

See merge request xonotic/xonotic-data.pk3dir!817


Trivial merge