Merge remote-tracking branch 'origin/master' into terencehill/menu_weaponarena_weapon...

author Samual Lenks <samual@xonotic.org>

Sun, 28 Apr 2013 23:09:42 +0000 (19:09 -0400)

committer Samual Lenks <samual@xonotic.org>

Sun, 28 Apr 2013 23:09:42 +0000 (19:09 -0400)
author Samual Lenks <samual@xonotic.org>
Sun, 28 Apr 2013 23:09:42 +0000 (19:09 -0400)
committer Samual Lenks <samual@xonotic.org>
Sun, 28 Apr 2013 23:09:42 +0000 (19:09 -0400)
diff --cc defaultXonotic.cfg
Simple merge
diff --cc qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c
Simple merge
author	Samual Lenks <samual@xonotic.org>
	Sun, 28 Apr 2013 23:09:42 +0000 (19:09 -0400)
committer	Samual Lenks <samual@xonotic.org>
	Sun, 28 Apr 2013 23:09:42 +0000 (19:09 -0400)
		1	2
defaultXonotic.cfg	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c	patch \|	diff1 \|	diff2 \|	blob \| history