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
..
Backgrounds	Normalize all the line endings	2018-04-13 18:26:38 +09:00
Charts	Normalize all the line endings	2018-04-13 18:26:38 +09:00
Direct	Normalize all the line endings	2018-04-13 18:26:38 +09:00
Edit	Merge remote-tracking branch 'origin/master' into disallow-beatmap-change	2018-06-06 18:26:51 +09:00
Menu	Merge remote-tracking branch 'origin/master' into disallow-beatmap-change	2018-06-06 18:26:51 +09:00
Multi	Merge branch 'master' into participant-count-default	2018-06-03 03:05:17 +09:00
Play	Merge remote-tracking branch 'origin/master' into disallow-beatmap-change	2018-06-06 18:26:51 +09:00
Ranking	Merge branch 'master' into disallow-beatmap-change	2018-06-04 10:53:04 +09:00
Select	Merge remote-tracking branch 'origin/master' into disallow-beatmap-change	2018-06-06 18:26:51 +09:00
Tournament	expose two Bindables with split logic instead of one with mixed logic	2018-05-21 15:53:55 +02:00
BackgroundScreen.cs	Merge remote-tracking branch 'upstream/master' into peppy-async-screens	2018-04-20 16:52:58 +09:00
Loader.cs	Tidy up Loader logic	2018-05-31 20:07:44 +09:00
OsuScreen.cs	Merge remote-tracking branch 'origin/master' into disallow-beatmap-change	2018-06-06 18:26:51 +09:00
ScreenWhiteBox.cs	Normalize all the line endings	2018-04-13 18:26:38 +09:00