Merge branch 'master' into terencehill/quickmenu_UPDATE

author terencehill <piuntn@gmail.com>

Tue, 21 Jan 2014 00:26:17 +0000 (01:26 +0100)

committer terencehill <piuntn@gmail.com>

Tue, 21 Jan 2014 00:26:17 +0000 (01:26 +0100)
author terencehill <piuntn@gmail.com>
Tue, 21 Jan 2014 00:26:17 +0000 (01:26 +0100)
committer terencehill <piuntn@gmail.com>
Tue, 21 Jan 2014 00:26:17 +0000 (01:26 +0100)
diff --cc common.it.po
Simple merge
diff --cc defaultXonotic.cfg
Simple merge
diff --cc qcsrc/client/Main.qc
Simple merge
diff --cc qcsrc/client/scoreboard.qc
Simple merge
diff --cc qcsrc/menu/classes.c
Simple merge
diff --cc qcsrc/menu/xonotic/mainwindow.c
Simple merge
author	terencehill <piuntn@gmail.com>
	Tue, 21 Jan 2014 00:26:17 +0000 (01:26 +0100)
committer	terencehill <piuntn@gmail.com>
	Tue, 21 Jan 2014 00:26:17 +0000 (01:26 +0100)
		1	2
common.it.po	patch \|	diff1 \|	diff2 \|	blob \| history
defaultXonotic.cfg	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/client/Main.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/client/scoreboard.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/menu/classes.c	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/menu/xonotic/mainwindow.c	patch \|	diff1 \|	diff2 \|	blob \| history