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

author Samual Lenks <samual@xonotic.org>

Tue, 15 Oct 2013 19:34:09 +0000 (15:34 -0400)

committer Samual Lenks <samual@xonotic.org>

Tue, 15 Oct 2013 19:34:09 +0000 (15:34 -0400)
author Samual Lenks <samual@xonotic.org>
Tue, 15 Oct 2013 19:34:09 +0000 (15:34 -0400)
committer Samual Lenks <samual@xonotic.org>
Tue, 15 Oct 2013 19:34:09 +0000 (15:34 -0400)
diff --cc gfx/menu/luminos/skinvalues.txt
Simple merge
diff --cc qcsrc/dpdefs/menudefs.qc
Simple merge
diff --cc qcsrc/menu/command/menu_cmd.qc
Simple merge
diff --cc qcsrc/menu/menu.qc
Simple merge
diff --cc qcsrc/menu/xonotic/dialog_settings_video.c
Simple merge
author	Samual Lenks <samual@xonotic.org>
	Tue, 15 Oct 2013 19:34:09 +0000 (15:34 -0400)
committer	Samual Lenks <samual@xonotic.org>
	Tue, 15 Oct 2013 19:34:09 +0000 (15:34 -0400)
		1	2
gfx/menu/luminos/skinvalues.txt	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/dpdefs/menudefs.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/menu/command/menu_cmd.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/menu/menu.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/menu/xonotic/dialog_settings_video.c	patch \|	diff1 \|	diff2 \|	blob \| history