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
..
Beatmaps	Move osu-resources to nuget	2019-01-28 18:33:39 +09:00
Chat	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00
NonVisual	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00
Resources	Rename file to match class	2019-01-28 18:41:57 +09:00
Scores/IO	Move osu-resources to nuget	2019-01-28 18:33:39 +09:00
ScrollAlgorithms	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00
Visual	Merge branch 'master' into tournament-tools	2019-02-02 19:09:48 +09:00
osu.Game.Tests.csproj	Update framework and other nuget packages	2019-01-16 10:14:37 +09:00
WaveformTestBeatmap.cs	Move osu-resources to nuget	2019-01-28 18:33:39 +09:00