smoogipoo 0693ab8e7d Merge remote-tracking branch 'origin/master' into osu-fontusage ... # Conflicts: # osu.Game/Screens/Multi/Components/BeatmapTitle.cs		2019-02-20 15:04:08 +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	timeRate -> clockRate	2019-02-19 14:29:23 +09:00
Resources	Remove unused pieces of ini	2019-02-05 18:08:27 +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
Skins	Fix class name	2019-02-05 18:09:15 +09:00
Visual	Merge remote-tracking branch 'origin/master' into osu-fontusage	2019-02-20 15:04:08 +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