smoogipoo ee1f9d4981 Merge remote-tracking branch 'origin/master' into profile-header-update ... # Conflicts: # osu-resources # osu.Game/Overlays/Profile/Components/GradeBadge.cs # osu.Game/Overlays/Profile/Header/BadgeContainer.cs # osu.Game/Overlays/Profile/Header/RankGraph.cs # osu.Game/Overlays/Profile/Header/SupporterIcon.cs # osu.Game/Overlays/Profile/ProfileHeader.cs		2019-03-06 15:53:30 +09:00
..
Backgrounds	Merge branch 'master' into more-inspections	2019-02-28 14:32:57 +09:00
Containers	Merge remote-tracking branch 'origin/master' into profile-header-update	2019-03-06 15:53:30 +09:00
Cursor	Fix remaining issues	2019-02-28 13:31:40 +09:00
Sprites	Adjust sprite texts in-line with framework changes	2019-02-20 15:03:20 +09:00
UserInterface	Merge remote-tracking branch 'origin/master' into profile-header-update	2019-03-06 15:53:30 +09:00
DrawableDate.cs	Fix remaining issues	2019-02-28 13:31:40 +09:00
IHasAccentColour.cs	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00
OsuColour.cs	Merge branch 'master' of git://github.com/ppy/osu into profile-header-update	2019-01-27 23:32:48 +01:00
OsuFont.cs	Fix venera fonts not being correctly specified	2019-02-22 19:42:09 +09:00
ScreenshotManager.cs	Adjust namespaces	2019-02-21 19:05:52 +09:00
SpriteIcon.cs	Merge branch 'master' into more-inspections	2019-02-28 14:32:57 +09:00