smoogipoo d7c09e7dbd Merge remote-tracking branch 'origin/master' into fix-new-inspections ... # Conflicts: # osu.Game.Rulesets.Catch/Judgements/CatchDropletJudgement.cs # osu.Game.Rulesets.Catch/Judgements/CatchJudgement.cs # osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs # osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs # osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs # osu.Game.Tests/Visual/SongSelect/TestCaseBeatmapScoresContainer.cs # osu.Game/Graphics/OsuFont.cs # osu.Game/Online/API/Requests/Responses/APILegacyScoreInfo.cs # osu.Game/Overlays/Profile/Header/BadgeContainer.cs # osu.Game/Overlays/Profile/ProfileHeader.cs # osu.Game/Screens/Select/PlaySongSelect.cs # osu.Game/Skinning/LegacySkinDecoder.cs		2019-05-07 13:20:17 +09:00
..
Overlays	Merge remote-tracking branch 'origin/master' into fix-new-inspections	2019-05-07 13:20:17 +09:00
Updater	Merge remote-tracking branch 'origin/master' into fix-new-inspections	2019-05-07 13:20:17 +09:00
lazer.ico	Add back osu.Desktop project	2017-10-14 14:33:05 +09:00
osu!.res	Add back osu.Desktop project	2017-10-14 14:33:05 +09:00
osu.Desktop.csproj	Bring nuget packages up to date	2019-03-22 02:41:21 +09:00
osu.nuspec	Standardise remaining cases	2019-01-24 18:24:30 +09:00
OsuGameDesktop.cs	Apply newline additions	2019-04-01 12:16:32 +09:00
Program.cs	Apply newline additions	2019-04-01 12:16:32 +09:00