]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into develop
authorMario <mario.mario@y7mail.com>
Sun, 22 Nov 2020 23:19:15 +0000 (09:19 +1000)
committerMario <mario.mario@y7mail.com>
Sun, 22 Nov 2020 23:19:15 +0000 (09:19 +1000)
commit6f2dda9a09068d57f8f12b5c8764181d2313617b
tree53c1d02feefcc6d1a297638100d53485bc3e0bd8
parentdd91bbdf840c2bc28ae164dd3d0e2e58b371554d
parent599557acffb1e7d4deca53b8ee06a9a6a6641483
Merge branch 'master' into develop
qcsrc/client/main.qc
qcsrc/client/view.qc