Merge branch 'master' into divVerent/4team_ctf

author Mario <mario.mario@y7mail.com>

Thu, 20 Mar 2014 02:15:31 +0000 (13:15 +1100)

committer Mario <mario.mario@y7mail.com>

Thu, 20 Mar 2014 02:15:31 +0000 (13:15 +1100)
author Mario <mario.mario@y7mail.com>
Thu, 20 Mar 2014 02:15:31 +0000 (13:15 +1100)
committer Mario <mario.mario@y7mail.com>
Thu, 20 Mar 2014 02:15:31 +0000 (13:15 +1100)
diff --cc gamemodes.cfg
Simple merge
diff --cc qcsrc/client/hud.qc
Simple merge
diff --cc qcsrc/client/waypointsprites.qc
Simple merge
diff --cc qcsrc/common/items.qh
Simple merge
diff --cc qcsrc/server/autocvars.qh
Simple merge
author	Mario <mario.mario@y7mail.com>
	Thu, 20 Mar 2014 02:15:31 +0000 (13:15 +1100)
committer	Mario <mario.mario@y7mail.com>
	Thu, 20 Mar 2014 02:15:31 +0000 (13:15 +1100)
		1	2
gamemodes.cfg	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/client/hud.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/client/waypointsprites.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/common/items.qh	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/server/autocvars.qh	patch \|	diff1 \|	diff2 \|	blob \| history