smoogipoo 9f730dd784 Merge branch 'editor-composer-cleanup' into mania-mask-container ... # Conflicts: # osu.Game/Rulesets/Edit/HitObjectComposer.cs # osu.Game/Screens/Edit/Screens/Compose/Layers/HitObjectMaskLayer.cs		2018-07-17 16:00:46 +09:00
..
Components	Make virtual beatmap tracks approximate beatmap length	2018-06-27 16:02:49 +09:00
Menus	Normalize all the line endings	2018-04-13 18:26:38 +09:00
Screens	Merge branch 'editor-composer-cleanup' into mania-mask-container	2018-07-17 16:00:46 +09:00
Editor.cs	Update framework	2018-07-11 17:12:01 +09:00
EditorClock.cs	Merge remote-tracking branch 'origin/master' into disallow-beatmap-change	2018-05-28 18:01:15 +09:00