1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 21:43:21 +08:00
osu-lazer/osu.Game/Screens/Edit
smoogipoo 56032a4522 Merge branch 'mania-selection-movement' into inter-column-movements
# Conflicts:
#	osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs
#	osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
2018-11-26 11:45:48 +09:00
..
Components OpenTK -> osuTK 2018-11-20 17:14:59 +09:00
Compose Merge branch 'mania-selection-movement' into inter-column-movements 2018-11-26 11:45:48 +09:00
Design OpenTK -> osuTK 2018-11-20 17:14:59 +09:00
Setup/Components/LabelledComponents OpenTK -> osuTK 2018-11-20 17:14:59 +09:00
BindableBeatDivisor.cs Remove intermediate Screens namespace 2018-11-06 18:28:22 +09:00
Editor.cs Add brackets 2018-11-23 10:06:06 +09:00
EditorClock.cs OpenTK -> osuTK 2018-11-20 17:14:59 +09:00
EditorScreen.cs Remove intermediate Screens namespace 2018-11-06 18:28:22 +09:00
EditorScreenMode.cs Remove intermediate Screens namespace 2018-11-06 18:28:22 +09:00