Dean Herbert 482a01e7ba Merge branch 'master' into tournament-tools ... # Conflicts: # osu.Game/Online/API/Requests/Responses/APIBeatmap.cs # osu.Game/OsuGameBase.cs # osu.Game/Overlays/ChatOverlay.cs # osu.Game/Screens/Menu/MainMenu.cs # osu.Game/Screens/Tournament/Drawings.cs # osu.Game/Screens/Tournament/Teams/DrawingsTeam.cs # osu.Game/osu.Game.csproj # osu.sln		2019-02-02 19:09:48 +09:00
..
Button.cs	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00
ButtonArea.cs	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00
ButtonSystem.cs	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00
Disclaimer.cs	Merge remote-tracking branch 'origin/master' into iscreen	2019-01-29 21:21:36 +09:00
ExitConfirmOverlay.cs	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00
FlowContainerWithOrigin.cs	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00
Intro.cs	Merge remote-tracking branch 'origin/master' into iscreen	2019-01-29 21:21:36 +09:00
IntroSequence.cs	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00
LogoVisualisation.cs	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00
MainMenu.cs	Merge branch 'master' into tournament-tools	2019-02-02 19:09:48 +09:00
MenuSideFlashes.cs	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00
OsuLogo.cs	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00