Merge remote branch 'origin/master' into samual/menu_updates
authorSamual <samual@xonotic.org>
Fri, 20 Jan 2012 02:54:40 +0000 (21:54 -0500)
committerSamual <samual@xonotic.org>
Fri, 20 Jan 2012 02:54:40 +0000 (21:54 -0500)
commitcd69940bb9c1aa5a98bf0653702b77d730419dde
treee8bf7138232443ec2d0724abe27117f3b2ae5da8
parent35a27cda61401d3d1af6782ee9c4661c7280f7ad
parent3e3baa2f19b654ab2982198e00ea8b09f885c66d
Merge remote branch 'origin/master' into samual/menu_updates

Conflicts:
qcsrc/menu/xonotic/dialog_settings_effects.c
defaultXonotic.cfg
effects-high.cfg
effects-low.cfg
effects-med.cfg
effects-normal.cfg
effects-omg.cfg
effects-ultimate.cfg
effects-ultra.cfg
qcsrc/client/autocvars.qh
qcsrc/menu/xonotic/dialog_settings_effects.c