Merge branch 'master' into terencehill/scoreboard_panel_2

author terencehill <piuntn@gmail.com>

Sun, 14 Aug 2016 09:48:56 +0000 (11:48 +0200)

committer terencehill <piuntn@gmail.com>

Sun, 14 Aug 2016 09:48:56 +0000 (11:48 +0200)
author terencehill <piuntn@gmail.com>
Sun, 14 Aug 2016 09:48:56 +0000 (11:48 +0200)
committer terencehill <piuntn@gmail.com>
Sun, 14 Aug 2016 09:48:56 +0000 (11:48 +0200)
diff --cc _hud_common.cfg
Simple merge
diff --cc defaultXonotic.cfg
Simple merge
diff --cc qcsrc/client/autocvars.qh
Simple merge
diff --cc qcsrc/client/hud/hud.qc
Simple merge
diff --cc qcsrc/client/hud/panel/centerprint.qc
Simple merge
diff --cc qcsrc/client/main.qc
Simple merge
diff --cc qcsrc/client/view.qc
Simple merge
author	terencehill <piuntn@gmail.com>
	Sun, 14 Aug 2016 09:48:56 +0000 (11:48 +0200)
committer	terencehill <piuntn@gmail.com>
	Sun, 14 Aug 2016 09:48:56 +0000 (11:48 +0200)
		1	2
_hud_common.cfg	patch \|	diff1 \|	diff2 \|	blob \| history
defaultXonotic.cfg	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/client/autocvars.qh	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/client/hud/hud.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/client/hud/panel/centerprint.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/client/main.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/client/view.qc	patch \|	diff1 \|	diff2 \|	blob \| history