smoogipoo 70f1d17b7e Merge remote-tracking branch 'origin/master' into editor-mask-placement ... # Conflicts: # osu.Game.Rulesets.Catch/UI/CatchRulesetContainer.cs # osu.Game.Rulesets.Mania/Edit/ManiaEditRulesetContainer.cs # osu.Game.Rulesets.Osu/Edit/OsuEditRulesetContainer.cs # osu.Game/Rulesets/UI/RulesetContainer.cs		2018-10-16 17:28:16 +09:00
..
Beatmaps	Fix colours with alpha components not being parsed	2018-10-05 11:19:01 +09:00
Chat	Normalize all the line endings	2018-04-13 18:26:38 +09:00
NonVisual	Fix up performance calculators	2018-06-14 16:04:48 +09:00
Resources	Fix colours with alpha components not being parsed	2018-10-05 11:19:01 +09:00
Visual	Merge remote-tracking branch 'origin/master' into editor-mask-placement	2018-10-16 17:28:16 +09:00
osu.Game.Tests.csproj	Remove nuget includes im props	2018-10-12 18:56:18 +09:00
WaveformTestBeatmap.cs	Use existing instance of beatmap rather than adding more resources	2018-06-17 19:00:58 +09:00