Merge branch 'beatmap_conversion' into mod_application

Conflicts:
	osu.Game.Modes.Catch/CatchRuleset.cs
	osu.Game.Modes.Mania/ManiaRuleset.cs
	osu.Game.Modes.Osu/OsuRuleset.cs
	osu.Game.Modes.Taiko/TaikoRuleset.cs
This commit is contained in:
smoogipooo
2017-03-12 22:20:52 +09:00
5 changed files with 0 additions and 26 deletions

View File

@ -6,7 +6,6 @@ using osu.Game.Beatmaps;
using osu.Game.Graphics;
using osu.Game.Modes.Mods;
using osu.Game.Modes.Objects;
using osu.Game.Modes.Osu.Beatmaps;
using osu.Game.Modes.Osu.Mods;
using osu.Game.Modes.Osu.Objects;
using osu.Game.Modes.Osu.UI;
@ -114,10 +113,5 @@ namespace osu.Game.Modes.Osu
new KeyCounterMouse(MouseButton.Left),
new KeyCounterMouse(MouseButton.Right)
};
public override IBeatmapConverter<T> CreateBeatmapConverter<T>()
{
return (IBeatmapConverter<T>)new OsuBeatmapConverter();
}
}
}