]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a0a09da 8e71b62)
Merge branch 'martin-t/qc2rust' into 'master'
authorMario <mario.mario@y7mail.com>
Sat, 14 Sep 2019 20:36:36 +0000 (20:36 +0000)
committerMario <mario.mario@y7mail.com>
Sat, 14 Sep 2019 20:36:36 +0000 (20:36 +0000)
Qc2rust branch with tiny changes

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


Trivial merge