1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-09 04:57:41 +08:00
osu-lazer/osu.Game/Overlays/Settings/Sections/Graphics
Damnae 2c245f4c22 Merge branch 'master' into storyboard_integration
# Conflicts:
#	osu.Game/Configuration/OsuConfigManager.cs
#	osu.Game/Overlays/Settings/Sections/Graphics/DetailSettings.cs
2017-09-22 12:45:34 +02:00
..
DetailSettings.cs Merge branch 'master' into storyboard_integration 2017-09-22 12:45:34 +02:00
LayoutSettings.cs Rename EasingTypes to Easing 2017-07-22 20:53:53 +02:00
MainMenuSettings.cs OsuConfig -> OsuSetting 2017-05-15 10:56:27 +09:00
RendererSettings.cs OsuConfig -> OsuSetting 2017-05-15 10:56:27 +09:00