smoogipoo 3f365c6621 Merge branch 'master' into editor-timeline-rework ... # Conflicts: # osu.Game.Tests/Visual/TestCaseEditorComposeTimeline.cs # osu.Game/Screens/Edit/Screens/Compose/Compose.cs # osu.Game/Screens/Edit/Screens/Compose/Timeline/ScrollableTimeline.cs # osu.Game/Screens/Edit/Screens/Compose/Timeline/ScrollingTimelineContainer.cs		2018-05-16 18:04:24 +09:00
..
Components	Normalize all the line endings	2018-04-13 18:26:38 +09:00
Menus	Normalize all the line endings	2018-04-13 18:26:38 +09:00
Screens	Merge branch 'master' into editor-timeline-rework	2018-05-16 18:04:24 +09:00
Editor.cs	Fix beatmap/ruleset being changeable while in the editor	2018-05-07 16:32:15 +09:00
EditorClock.cs	Normalize all the line endings	2018-04-13 18:26:38 +09:00