Thomas Müller 4d8261fe0b Merge branch 'master' of https://github.com/ppy/osu into better-transforms ... # Conflicts: # osu-framework # osu.Game/Graphics/Cursor/OsuTooltipContainer.cs # osu.Game/Overlays/DragBar.cs		2017-07-18 15:16:02 +03:00
..
Avatar.cs	Set RelativeSizeAxes for updated FillMode behavior	2017-06-28 12:24:23 +03:00
Country.cs	Let's not use Country for drawings-specific stuff...	2017-05-02 13:02:14 +09:00
Medal.cs	Medal sprite, make MedalOverlay auto-show when loaded.	2017-06-24 01:19:44 -03:00
Team.cs	Fix incorrect inheritance.	2017-05-02 17:58:59 +09:00
UpdateableAvatar.cs	Container->Wrapper.	2017-04-02 16:17:13 +09:00
User.cs	Add dummy data in test case.	2017-06-26 00:43:32 +08:00
UserCoverBackground.cs	Move namespace and make cover background public.	2017-05-27 23:37:15 +08:00
UserPanel.cs	Merge branch 'master' of https://github.com/ppy/osu into better-transforms	2017-07-18 15:16:02 +03:00
UserStatistics.cs	Change some small classes to struct to avoid potential null check.	2017-06-25 10:51:54 +08:00
UserStatus.cs	Fix Black Space after } and Symbol Spacing	2017-06-08 14:48:42 +08:00