Dean Herbert 14b22445fa Merge remote-tracking branch 'upstream/master' into general-fixes ... # Conflicts: # osu.Game/Modes/UI/HitRenderer.cs		2017-03-14 16:15:26 +09:00
..
Mods	Applyable -> Applicable.	2017-03-14 12:32:31 +09:00
Objects	Remove old, unused hit object converters (will be re-implemented through IBeatmapConverter).	2017-03-13 14:50:55 +09:00
UI	Merge remote-tracking branch 'upstream/master' into general-fixes	2017-03-14 16:15:26 +09:00
LegacyReplay.cs	Update framework.	2017-03-14 12:01:58 +09:00
PlayMode.cs	Added Descriptions to Rulesets + PlayModes list	2017-03-09 21:37:03 +01:00
Replay.cs	Replay loading via drag-drop huzzah!	2017-03-04 19:02:43 +09:00
Ruleset.cs	Merge branch 'beatmap_conversion' into mod_application	2017-03-12 22:20:52 +09:00
Score.cs	Combo should not be longs.	2017-03-10 16:05:05 +09:00
ScoreProcesssor.cs	Combo should not be longs.	2017-03-10 16:05:05 +09:00