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

author Samual Lenks <samual@xonotic.org>

Fri, 8 Feb 2013 02:21:08 +0000 (21:21 -0500)

committer Samual Lenks <samual@xonotic.org>

Fri, 8 Feb 2013 02:21:08 +0000 (21:21 -0500)
author Samual Lenks <samual@xonotic.org>
Fri, 8 Feb 2013 02:21:08 +0000 (21:21 -0500)
committer Samual Lenks <samual@xonotic.org>
Fri, 8 Feb 2013 02:21:08 +0000 (21:21 -0500)
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/autocvars.qh
Simple merge
diff --cc qcsrc/server/g_world.qc
Simple merge
author	Samual Lenks <samual@xonotic.org>
	Fri, 8 Feb 2013 02:21:08 +0000 (21:21 -0500)
committer	Samual Lenks <samual@xonotic.org>
	Fri, 8 Feb 2013 02:21:08 +0000 (21:21 -0500)
		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/autocvars.qh	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/server/g_world.qc	patch \|	diff1 \|	diff2 \|	blob \| history