Merge branch 'master' into fruitiex/newpanelhud

author Rudolf Polzer <divverent@alientrap.org>

Mon, 10 May 2010 11:15:27 +0000 (13:15 +0200)

committer Rudolf Polzer <divverent@alientrap.org>

Mon, 10 May 2010 11:15:27 +0000 (13:15 +0200)
author Rudolf Polzer <divverent@alientrap.org>
Mon, 10 May 2010 11:15:27 +0000 (13:15 +0200)
committer Rudolf Polzer <divverent@alientrap.org>
Mon, 10 May 2010 11:15:27 +0000 (13:15 +0200)
diff --cc defaultXonotic.cfg
Simple merge
diff --cc qcsrc/client/Main.qc
Simple merge
diff --cc qcsrc/client/View.qc
Simple merge
diff --cc qcsrc/client/main.qh
Simple merge
diff --cc qcsrc/common/constants.qh
Simple merge
author	Rudolf Polzer <divverent@alientrap.org>
	Mon, 10 May 2010 11:15:27 +0000 (13:15 +0200)
committer	Rudolf Polzer <divverent@alientrap.org>
	Mon, 10 May 2010 11:15:27 +0000 (13:15 +0200)
		1	2
defaultXonotic.cfg	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/client/Main.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/client/View.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/client/main.qh	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/common/constants.qh	patch \|	diff1 \|	diff2 \|	blob \| history