smoogipoo 55475d129f Merge remote-tracking branch 'origin/master' into mania-mask-container ... # Conflicts: # osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs		2018-06-07 19:19:20 +09:00
..
Tools	Sync changes on composition tools	2018-05-22 09:00:11 +03:00
Types	Remove useless things	2018-05-21 23:24:10 +03:00
HitObjectComposer.cs	Merge remote-tracking branch 'origin/master' into mania-mask-container	2018-06-07 19:19:20 +09:00
HitObjectMask.cs	Implement mask layering (incomplete)	2018-05-21 23:08:04 +03:00
ToolboxGroup.cs	Normalize all the line endings	2018-04-13 18:26:38 +09:00