1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 20:45:46 +08:00
osu-lazer/osu.Game/Screens/Edit/Compose/Components
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
..
Timeline OpenTK -> osuTK 2018-11-20 17:14:59 +09:00
BeatDivisorControl.cs OpenTK -> osuTK 2018-11-20 17:14:59 +09:00
BlueprintContainer.cs SelectionBox -> SelectionHandler 2018-11-19 16:58:11 +09:00
DragBox.cs Merge branch 'mania-selection-movement' into inter-column-movements 2018-11-26 11:45:48 +09:00
EditorPlayfieldBorder.cs OpenTK -> osuTK 2018-11-20 17:14:59 +09:00
SelectionHandler.cs Merge branch 'mania-selection-movement' into inter-column-movements 2018-11-26 11:45:48 +09:00