Merge branch 'master' into Mario/mutators

author Mario <mario.mario@y7mail.com>

Tue, 25 Jun 2013 13:05:43 +0000 (23:05 +1000)

committer Mario <mario.mario@y7mail.com>

Tue, 25 Jun 2013 13:05:43 +0000 (23:05 +1000)
author Mario <mario.mario@y7mail.com>
Tue, 25 Jun 2013 13:05:43 +0000 (23:05 +1000)
committer Mario <mario.mario@y7mail.com>
Tue, 25 Jun 2013 13:05:43 +0000 (23:05 +1000)
diff --cc defaultXonotic.cfg
Simple merge
diff --cc gamemodes.cfg
Simple merge
diff --cc qcsrc/server/cl_client.qc
Simple merge
diff --cc qcsrc/server/progs.src
Simple merge
diff --cc qcsrc/server/t_items.qc
Simple merge
author	Mario <mario.mario@y7mail.com>
	Tue, 25 Jun 2013 13:05:43 +0000 (23:05 +1000)
committer	Mario <mario.mario@y7mail.com>
	Tue, 25 Jun 2013 13:05:43 +0000 (23:05 +1000)
		1	2
defaultXonotic.cfg	patch \|	diff1 \|	diff2 \|	blob \| history
gamemodes.cfg	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/server/cl_client.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/server/progs.src	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/server/t_items.qc	patch \|	diff1 \|	diff2 \|	blob \| history