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)
commitf8d89c06e0b40ce3d7ec536868d24059f0505096
tree0d93c965bb3e3be5fcf9d97cf60c1defcab55114
parent78b492e970c44292361dc92974e4c487c1ccf041
parent6042228a26fd6fe48bf7ee6cb7c284257bb498d9
Merge remote-tracking branch 'origin/master' into samual/combined_updates
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