smoogipoo 4086ff7313 Merge remote-tracking branch 'origin/master' into disallow-beatmap-change ... # Conflicts: # osu.Game.Tests/Visual/TestCaseBeatmapInfoWedge.cs # osu.Game/Screens/Menu/Intro.cs # osu.Game/Screens/Menu/MenuSideFlashes.cs		2018-06-06 18:26:51 +09:00
..
Beatmaps	Fix conversion tests for ruleset-specific beatmaps not working	2018-05-16 13:09:48 +09:00
Platform	Normalize all the line endings	2018-04-13 18:26:38 +09:00
Visual	Merge remote-tracking branch 'origin/master' into disallow-beatmap-change	2018-06-06 18:26:51 +09:00
CleanRunHeadlessGameHost.cs	Normalize all the line endings	2018-04-13 18:26:38 +09:00
OsuTestBrowser.cs	Normalize all the line endings	2018-04-13 18:26:38 +09:00
VisualTestRunner.cs	Normalize all the line endings	2018-04-13 18:26:38 +09:00