Merge remote-tracking branch 'upstream/master' into clock-fixes

This commit is contained in:
Dean Herbert
2018-03-02 21:01:53 +09:00
119 changed files with 2703 additions and 82 deletions

View File

@ -40,7 +40,7 @@ namespace osu.Game.Rulesets.UI
});
}
public class ScaledContainer : Container
private class ScaledContainer : Container
{
/// <summary>
/// The value to scale the width of the content to match.