]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into develop
authorterencehill <piuntn@gmail.com>
Tue, 12 Apr 2022 11:56:49 +0000 (13:56 +0200)
committerterencehill <piuntn@gmail.com>
Tue, 12 Apr 2022 11:56:49 +0000 (13:56 +0200)
commitaf2f0cb624aaf967708b22e1303d113668af5114
tree29a8eb4aa1aea1c9446c4c27baca60d2ccac7ff9
parentf22b9f83b24cae4a7e31ef6e310214be7d735a4d
parentd17fba96da03896d8f439bb89aa7f17895150488
Merge branch 'master' into develop
qcsrc/client/csqcmodel_hooks.qc
qcsrc/client/main.qc
qcsrc/client/view.qc
qcsrc/common/weapons/all.qh
xonotic-client.cfg