]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into terencehill/welcome_dialog_simple
authorterencehill <piuntn@gmail.com>
Sat, 26 Mar 2022 09:33:54 +0000 (10:33 +0100)
committerterencehill <piuntn@gmail.com>
Sat, 26 Mar 2022 09:33:54 +0000 (10:33 +0100)
1  2 
qcsrc/server/client.qc

Simple merge