Merge branch 'master' into martin-t/mg-solidpen

author Martin Taibr <taibr.martin@gmail.com>

Tue, 3 Sep 2019 10:23:22 +0000 (12:23 +0200)

committer Martin Taibr <taibr.martin@gmail.com>

Tue, 3 Sep 2019 10:23:22 +0000 (12:23 +0200)
author Martin Taibr <taibr.martin@gmail.com>
Tue, 3 Sep 2019 10:23:22 +0000 (12:23 +0200)
committer Martin Taibr <taibr.martin@gmail.com>
Tue, 3 Sep 2019 10:23:22 +0000 (12:23 +0200)
diff --cc bal-wep-xpm.cfg
Simple merge
diff --cc qcsrc/server/autocvars.qh
Simple merge
diff --cc qcsrc/server/defs.qh
Simple merge
diff --cc xonotic-server.cfg
Simple merge
author	Martin Taibr <taibr.martin@gmail.com>
	Tue, 3 Sep 2019 10:23:22 +0000 (12:23 +0200)
committer	Martin Taibr <taibr.martin@gmail.com>
	Tue, 3 Sep 2019 10:23:22 +0000 (12:23 +0200)
		1	2
bal-wep-xpm.cfg	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/server/autocvars.qh	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/server/defs.qh	patch \|	diff1 \|	diff2 \|	blob \| history
xonotic-server.cfg	patch \|	diff1 \|	diff2 \|	blob \| history