]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into terencehill/welcome_dialog_translatable
authorterencehill <piuntn@gmail.com>
Fri, 8 Apr 2022 12:37:02 +0000 (14:37 +0200)
committerterencehill <piuntn@gmail.com>
Fri, 8 Apr 2022 12:37:02 +0000 (14:37 +0200)
1  2 
qcsrc/client/main.qc

Simple merge