]> 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: 9941c9b 53c87b8)
Merge branch 'Mario/csqc_muzzleflash' into 'master'
authorMario <mario.mario@y7mail.com>
Sat, 18 Jul 2020 12:23:39 +0000 (12:23 +0000)
committerMario <mario.mario@y7mail.com>
Sat, 18 Jul 2020 12:23:39 +0000 (12:23 +0000)
Merge branch Mario/csqc_muzzleflash (M merge request)

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


Trivial merge