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
..
API	Merge branch 'master' into tournament-tools	2019-02-02 19:09:48 +09:00
Chat	Merge branch 'master' into tournament-tools	2019-02-02 19:09:48 +09:00
Leaderboards	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00
Multiplayer	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00
PollingComponent.cs	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00