]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into develop
authorMario <mario.mario@y7mail.com>
Mon, 10 Jan 2022 00:49:36 +0000 (10:49 +1000)
committerMario <mario.mario@y7mail.com>
Mon, 10 Jan 2022 00:49:36 +0000 (10:49 +1000)
commitf22b9f83b24cae4a7e31ef6e310214be7d735a4d
tree11205dc4cd9d8de8c40530ce954a67c8a0335ea8
parentaa7d2f01b3013bab75ad7bb0171eddb6bd86465b
parentd14f3f5afd18ad9cb251e487f1ca7632d84bf48b
Merge branch 'master' into develop
qcsrc/client/csqcmodel_hooks.qc
qcsrc/client/csqcmodel_hooks.qh
qcsrc/client/main.qc
qcsrc/client/view.qc
qcsrc/client/weapons/projectile.qc
qcsrc/common/turrets/cl_turrets.qc
qcsrc/common/weapons/all.qh
xonotic-client.cfg