]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1500119 973d3d5)
Merge branch 'Mario/rain_fix' into 'master'
authorMario <mario.mario@y7mail.com>
Mon, 20 Jan 2020 19:09:39 +0000 (19:09 +0000)
committerMario <mario.mario@y7mail.com>
Mon, 20 Jan 2020 19:09:39 +0000 (19:09 +0000)
Merge branch Mario/rain_fix (M merge request)

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


Trivial merge