Merge branch 'nyov/samual/combined_updates' into nyov/combined_updates/effects
authornyov <nyov@nexnode.net>
Wed, 26 Nov 2014 05:40:17 +0000 (05:40 +0000)
committernyov <nyov@nexnode.net>
Wed, 26 Nov 2014 05:44:33 +0000 (05:44 +0000)
commit498bd21f83049cfcca6e5336cb23c4fdef15ff92
treea0cd8f8ce8f1a47a8827f388ae27c05dbd6b5133
parentaf818d85ab5246b8ecd1743ecf808d39e4396445
parentd9b5f3d1a9c73003eb046909ffb9832d46505ed7
Merge branch 'nyov/samual/combined_updates' into nyov/combined_updates/effects
effects-high.cfg
effects-low.cfg
effects-omg.cfg
effects-ultra.cfg
qcsrc/menu/classes.c
qcsrc/menu/xonotic/dialog_settings_effects.c