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

..

Beatmaps

Fix tests

2018-05-11 16:13:00 +09:00

Chat

Normalize all the line endings

2018-04-13 18:26:38 +09:00

Resources

Normalize all the line endings

2018-04-13 18:26:38 +09:00

Visual

Merge branch 'master' into editor-timeline-rework

2018-05-16 18:04:24 +09:00

osu.Game.Tests.csproj

Update to .NET 4.7.1

2018-04-20 14:46:52 +09:00