git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit

]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit

author	terencehill <piuntn@gmail.com>
	Thu, 31 Mar 2022 16:32:53 +0000 (18:32 +0200)
committer	terencehill <piuntn@gmail.com>
	Thu, 31 Mar 2022 16:32:53 +0000 (18:32 +0200)
commit	82e5c474d4af81e54797d363adcf331548262144
tree	b83c7eed5af5e023ac3536b0406311ca6936df16	tree \| snapshot
parent	c40b08cae26d80d1f3e8706db468bf0d06b30c59	commit \| diff
parent	3c16d8ecf9757475c4faa62154354a4009b08984	commit \| diff

Merge branch 'master' into terencehill/welcome_dialog_translatable

# Conflicts:
# qcsrc/client/main.qc
# qcsrc/server/client.qc