Merge branch 'master' into profile

This commit is contained in:
Huo Yaoyuan
2017-07-02 22:03:30 +08:00
50 changed files with 291 additions and 146 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;