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
..
Components	Merge branch 'master' into tournament-tools	2019-02-02 19:09:48 +09:00
IPC	Move channel reading to new ipc file	2018-11-17 21:26:56 +09:00
Properties	Move existing tournament resources to new project	2018-09-21 18:18:28 +09:00
Resources	Add automatic country/user information lookups	2018-11-07 17:20:50 +09:00
Screens	Merge branch 'master' into tournament-tools	2019-02-02 19:09:48 +09:00
LadderInfo.cs	Add ability to select current match	2018-11-07 01:24:35 +09:00
osu.Game.Tournament.csproj	Move existing tournament resources to new project	2018-09-21 18:18:28 +09:00
TournamentGame.cs	Add ability to select current match	2018-11-07 01:24:35 +09:00
TournamentGameBase.cs	Automatically fix invalid pairing dates on load (based on contained groupings)	2018-12-14 18:11:04 +09:00