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
..
Buttons	Merge remote-tracking branch 'origin/master' into fix-new-inspections	2019-05-07 13:20:17 +09:00
Scores	Fix post-merge errors	2019-04-09 16:27:10 +09:00
AuthorInfo.cs	Adjust namespaces	2019-04-02 14:51:28 +09:00
BasicStats.cs	Update font awesome usage	2019-04-02 19:55:24 +09:00
BeatmapPicker.cs	Update font awesome usage	2019-04-02 19:55:24 +09:00
Details.cs	Merge branch 'master' into more-inspections	2019-02-28 14:32:57 +09:00
Header.cs	Merge remote-tracking branch 'origin/master' into fix-new-inspections	2019-05-07 13:20:17 +09:00
Info.cs	Adjust namespaces	2019-04-02 14:51:28 +09:00
SuccessRate.cs	Merge branch 'master' into more-inspections	2019-02-28 14:32:57 +09:00