]> 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: 35fe966 9941c9b)
Merge branch 'master' into Mario/csqc_muzzleflash
authorMario <mario.mario@y7mail.com>
Sat, 18 Jul 2020 12:01:19 +0000 (22:01 +1000)
committerMario <mario.mario@y7mail.com>
Sat, 18 Jul 2020 12:01:19 +0000 (22:01 +1000)

Trivial merge