Merge branch 'master' into drjaska/mayhem

author drjaska <drjaska83@gmail.com>

Tue, 18 Jan 2022 21:41:27 +0000 (23:41 +0200)

committer drjaska <drjaska83@gmail.com>

Tue, 18 Jan 2022 21:41:27 +0000 (23:41 +0200)
author drjaska <drjaska83@gmail.com>
Tue, 18 Jan 2022 21:41:27 +0000 (23:41 +0200)
committer drjaska <drjaska83@gmail.com>
Tue, 18 Jan 2022 21:41:27 +0000 (23:41 +0200)
diff --cc balance-xonotic.cfg
Simple merge
diff --cc balance-xpm.cfg
Simple merge
diff --cc gamemodes-server.cfg
Simple merge
diff --cc qcsrc/server/world.qc
Simple merge
author	drjaska <drjaska83@gmail.com>
	Tue, 18 Jan 2022 21:41:27 +0000 (23:41 +0200)
committer	drjaska <drjaska83@gmail.com>
	Tue, 18 Jan 2022 21:41:27 +0000 (23:41 +0200)
		1	2
balance-xonotic.cfg	patch \|	diff1 \|	diff2 \|	blob \| history
balance-xpm.cfg	patch \|	diff1 \|	diff2 \|	blob \| history
gamemodes-server.cfg	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/server/world.qc	patch \|	diff1 \|	diff2 \|	blob \| history