Merge remote-tracking branch 'origin/master' into samual/combined_updates

author Samual Lenks <samual@xonotic.org>

Wed, 26 Feb 2014 21:29:11 +0000 (16:29 -0500)

committer Samual Lenks <samual@xonotic.org>

Wed, 26 Feb 2014 21:29:11 +0000 (16:29 -0500)
author Samual Lenks <samual@xonotic.org>
Wed, 26 Feb 2014 21:29:11 +0000 (16:29 -0500)
committer Samual Lenks <samual@xonotic.org>
Wed, 26 Feb 2014 21:29:11 +0000 (16:29 -0500)
diff --cc gamemodes.cfg
Simple merge
diff --cc qcsrc/client/View.qc
Simple merge
diff --cc qcsrc/client/autocvars.qh
Simple merge
diff --cc qcsrc/server/autocvars.qh
Simple merge
diff --cc qcsrc/server/miscfunctions.qc
Simple merge
author	Samual Lenks <samual@xonotic.org>
	Wed, 26 Feb 2014 21:29:11 +0000 (16:29 -0500)
committer	Samual Lenks <samual@xonotic.org>
	Wed, 26 Feb 2014 21:29:11 +0000 (16:29 -0500)
		1	2
gamemodes.cfg	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/client/View.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/client/autocvars.qh	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/server/autocvars.qh	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/server/miscfunctions.qc	patch \|	diff1 \|	diff2 \|	blob \| history