smoogipoo 577ff4cc7f Merge remote-tracking branch 'origin/master' into mania-mask-container ... # Conflicts: # osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs # osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs # osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs # osu.Game.Rulesets.Mania/UI/ManiaStage.cs		2018-07-17 13:13:57 +09:00
..
Drawables	Merge remote-tracking branch 'origin/master' into mania-mask-container	2018-07-17 13:13:57 +09:00
BarLine.cs	Normalize all the line endings	2018-04-13 18:26:38 +09:00
HoldNote.cs	Fix hold note hitwindow lenience	2018-05-17 13:59:04 +09:00
HoldNoteTick.cs	Normalize all the line endings	2018-04-13 18:26:38 +09:00
ManiaHitObject.cs	Complete PR's independence	2018-05-22 09:18:02 +03:00
ManiaHitObjectDifficulty.cs	Normalize all the line endings	2018-04-13 18:26:38 +09:00
ManiaHitWindows.cs	Move ruleset-specific hitwindows to post-converted hitobjects	2018-05-17 13:35:15 +09:00
Note.cs	Normalize all the line endings	2018-04-13 18:26:38 +09:00