]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into terencehill/welcome_dialog_translatable 1000/head
authorterencehill <piuntn@gmail.com>
Tue, 12 Apr 2022 17:11:20 +0000 (19:11 +0200)
committerterencehill <piuntn@gmail.com>
Tue, 12 Apr 2022 17:11:20 +0000 (19:11 +0200)
commitd2b0f12cb08fe3d1e59d3c9514546c4858cf9012
tree39eecaa80001839909471655c60e3bfb9cef3313
parent6f3a2d52796c4bb7cb689188e2fe5a733ad49d7c
parentd17fba96da03896d8f439bb89aa7f17895150488
Merge branch 'master' into terencehill/welcome_dialog_translatable
qcsrc/client/main.qc
qcsrc/server/client.qc