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

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

Wed, 13 Feb 2019 23:38:24 +0000 (00:38 +0100)

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

Wed, 13 Feb 2019 23:38:24 +0000 (00:38 +0100)
author Martin Taibr <taibr.martin@gmail.com>
Wed, 13 Feb 2019 23:38:24 +0000 (00:38 +0100)
committer Martin Taibr <taibr.martin@gmail.com>
Wed, 13 Feb 2019 23:38:24 +0000 (00:38 +0100)
diff --cc qcsrc/server/autocvars.qh
Simple merge
diff --cc qcsrc/server/defs.qh
Simple merge
diff --cc qcsrc/server/weapons/tracing.qc
Simple merge
diff --cc vehicles.cfg
Simple merge
diff --cc xonotic-server.cfg
Simple merge
author	Martin Taibr <taibr.martin@gmail.com>
	Wed, 13 Feb 2019 23:38:24 +0000 (00:38 +0100)
committer	Martin Taibr <taibr.martin@gmail.com>
	Wed, 13 Feb 2019 23:38:24 +0000 (00:38 +0100)
		1	2
qcsrc/server/autocvars.qh	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/server/defs.qh	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/server/weapons/tracing.qc	patch \|	diff1 \|	diff2 \|	blob \| history
vehicles.cfg	patch \|	diff1 \|	diff2 \|	blob \| history
xonotic-server.cfg	patch \|	diff1 \|	diff2 \|	blob \| history