]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into Mario/qc_camstuff
authorMario <mario.mario@y7mail.com>
Mon, 30 Dec 2019 13:36:43 +0000 (23:36 +1000)
committerMario <mario.mario@y7mail.com>
Mon, 30 Dec 2019 13:36:43 +0000 (23:36 +1000)
1  2 
qcsrc/client/view.qc

Simple merge