]> 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 | combined (merge: 88dc682 e928607)
Merge branch 'Mario/qc_camstuff' into 'master'
authorMario <mario.mario@y7mail.com>
Tue, 31 Dec 2019 15:15:12 +0000 (15:15 +0000)
committerMario <mario.mario@y7mail.com>
Tue, 31 Dec 2019 15:15:12 +0000 (15:15 +0000)
Merge branch Mario/qc_camstuff (M merge request)

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


Trivial merge