smoogipoo b97b575b27 Merge remote-tracking branch 'origin/master' into editor-waveform ... # Conflicts: # osu-framework		2017-10-09 17:20:24 +09:00
..
Components/Timelines/Summary	Fix test case not working as expected	2017-09-27 12:46:34 +08:00
Menus	Make compose mode the default	2017-10-07 01:46:54 +09:00
Screens	Merge remote-tracking branch 'origin/master' into editor-waveform	2017-10-09 17:20:24 +09:00
Editor.cs	Put screens below the top and bottom bars of the editor	2017-10-07 01:56:11 +09:00