]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into develop
authorterencehill <piuntn@gmail.com>
Fri, 22 Apr 2022 00:41:18 +0000 (02:41 +0200)
committerterencehill <piuntn@gmail.com>
Fri, 22 Apr 2022 00:41:18 +0000 (02:41 +0200)
commitb12384978a6b1ad4ca08c8a35f8a197a36ec5e05
tree21a9f12d3a237614f5b05599a8bb8f541a33595f
parentaf2f0cb624aaf967708b22e1303d113668af5114
parent42aa739a402203a106eb730680849e18b4684150
Merge branch 'master' into develop
qcsrc/client/main.qc