Merge remote-tracking branch 'origin/master' into samual/combined_updates
authorSamual Lenks <samual@xonotic.org>
Tue, 15 Oct 2013 19:34:09 +0000 (15:34 -0400)
committerSamual Lenks <samual@xonotic.org>
Tue, 15 Oct 2013 19:34:09 +0000 (15:34 -0400)
1  2 
gfx/menu/luminos/skinvalues.txt
qcsrc/dpdefs/menudefs.qc
qcsrc/menu/command/menu_cmd.qc
qcsrc/menu/menu.qc
qcsrc/menu/xonotic/dialog_settings_video.c

Simple merge
Simple merge
Simple merge
Simple merge