Merge branch 'master' into settingsoverlay-scrollto

This commit is contained in:
Thomas Müller
2017-07-08 12:21:11 +03:00
committed by GitHub
80 changed files with 366 additions and 225 deletions

View File

@ -15,7 +15,7 @@ using osu.Game.Overlays.Settings.Sections;
namespace osu.Game.Overlays
{
public class SettingsOverlay : FocusedOverlayContainer
public class SettingsOverlay : OsuFocusedOverlayContainer
{
internal const float CONTENT_MARGINS = 10;