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
..
Requests	Merge branch 'master' into tournament-tools	2019-02-02 19:09:48 +09:00
APIAccess.cs	Merge remote-tracking branch 'upstream/master' into download-tracking-component	2019-01-31 18:45:09 +09:00
APIDownloadRequest.cs	Attach progress immediately	2019-01-31 19:08:45 +09:00
APIMessagesRequest.cs	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00
APIRequest.cs	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00
DummyAPIAccess.cs	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00
IAPIProvider.cs	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00
IOnlineComponent.cs	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00
OAuth.cs	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00
OAuthToken.cs	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00
RegistrationRequest.cs	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00