Merge branch 'master' into skin--completion

This commit is contained in:
Dan Balasescu
2018-03-22 16:39:08 +09:00
committed by Dean Herbert
26 changed files with 139 additions and 112 deletions

View File

@ -23,6 +23,6 @@ namespace osu.Game.Skinning
SampleChannel GetSample(string sampleName);
Color4? GetComboColour(IHasComboIndex comboObject);
Color4? GetComboColour(IHasComboInformation comboObject);
}
}