Merge branch 'master' into Mario/monsters

author Mario <mario.mario@y7mail.com>

Tue, 4 Jun 2013 00:10:43 +0000 (10:10 +1000)

committer Mario <mario.mario@y7mail.com>

Tue, 4 Jun 2013 00:10:43 +0000 (10:10 +1000)
author Mario <mario.mario@y7mail.com>
Tue, 4 Jun 2013 00:10:43 +0000 (10:10 +1000)
committer Mario <mario.mario@y7mail.com>
Tue, 4 Jun 2013 00:10:43 +0000 (10:10 +1000)
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/server/mutators/gamemode_ctf.qc
Simple merge
author	Mario <mario.mario@y7mail.com>
	Tue, 4 Jun 2013 00:10:43 +0000 (10:10 +1000)
committer	Mario <mario.mario@y7mail.com>
	Tue, 4 Jun 2013 00:10:43 +0000 (10:10 +1000)
		1	2
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/server/mutators/gamemode_ctf.qc	patch \|	diff1 \|	diff2 \|	blob \| history