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
..
ControlPanel.cs	Merge remote-tracking branch 'upstream/master' into tournament-tools	2018-11-22 10:25:30 +09:00
DateTextBox.cs	Add better date string formatting	2018-11-17 14:05:42 +09:00
DrawableTournamentTeam.cs	Complete editing support	2018-09-22 06:32:30 +09:00
MatchChatDisplay.cs	Merge branch 'master' into tournament-tools	2019-02-02 19:09:48 +09:00
SongBar.cs	Fix spacing and colouring of song bar eleemnts	2018-11-22 17:26:19 +09:00
TournamentBeatmapPanel.cs	Fix handling of API responses	2018-12-01 09:50:11 +09:00
TournamentTeam.cs	Add automatic country/user information lookups	2018-11-07 17:20:50 +09:00