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
..
EditorClockTestCase.cs	Merge remote-tracking branch 'origin/master' into disallow-beatmap-change	2018-06-06 18:26:51 +09:00
EditorTestCase.cs	Privatise the OsuGame beatmap, add local beatmap to OsuTestCase	2018-05-23 17:38:02 +09:00
ManualInputManagerTestCase.cs	Normalize all the line endings	2018-04-13 18:26:38 +09:00
OsuTestCase.cs	Make GameBeatmap late-bind its AudioManager for ctor Beatmap access	2018-05-28 17:55:41 +09:00
ScreenTestCase.cs	Normalize all the line endings	2018-04-13 18:26:38 +09:00
TestCasePerformancePoints.cs	Privatise the OsuGame beatmap, add local beatmap to OsuTestCase	2018-05-23 17:38:02 +09:00
TestCasePlayer.cs	Merge remote-tracking branch 'origin/master' into disallow-beatmap-change	2018-05-28 18:01:15 +09:00