Merge remote-tracking branch 'refs/remotes/upstream/master' into options-fixes

This commit is contained in:
Dean Herbert
2016-11-09 11:41:36 +09:00
8 changed files with 10 additions and 10 deletions

View File

@ -29,7 +29,7 @@ namespace osu.Game
public APIAccess API;
protected override Container Content => ratioContainer;
protected override Container<Drawable> Content => ratioContainer;
private RatioAdjust ratioContainer;