smoogipoo 4070c1a888 Merge remote-tracking branch 'origin/master' into non-null-ruleset ... # Conflicts: # osu.Game/Screens/Select/FilterControl.cs		2018-07-02 15:05:34 +09:00
..
Beatmaps	Use existing instance of beatmap rather than adding more resources	2018-06-17 19:00:58 +09:00
Chat	Normalize all the line endings	2018-04-13 18:26:38 +09:00
NonVisual	Fix up performance calculators	2018-06-14 16:04:48 +09:00
Resources	Normalize all the line endings	2018-04-13 18:26:38 +09:00
Visual	Merge remote-tracking branch 'origin/master' into non-null-ruleset	2018-07-02 15:05:34 +09:00
osu.Game.Tests.csproj	Update project build configurations to target netcoreapp2.1	2018-06-02 22:20:17 +09:00
WaveformTestBeatmap.cs	Use existing instance of beatmap rather than adding more resources	2018-06-17 19:00:58 +09:00