Dean Herbert 7fe2f6639d Merge remote-tracking branch 'upstream/master' into results-screen ... # Conflicts: # osu.Game/Users/User.cs		2017-04-19 20:51:05 +09:00
..
AspectContainer.cs	Add license headers.	2017-04-18 22:35:21 +09:00
ResultMode.cs	Add license headers.	2017-04-18 22:35:21 +09:00
ResultModeButton.cs	Add license headers.	2017-04-18 22:35:21 +09:00
ResultModeTabControl.cs	Add license headers.	2017-04-18 22:35:21 +09:00
Results.cs	Fix CI issues.	2017-04-18 22:28:16 +09:00
ResultsPage.cs	Adjust colour metrics.	2017-04-18 22:22:14 +09:00
ResultsPageRanking.cs	Add progress graph background and update ruleset references.	2017-04-18 22:22:14 +09:00
ResultsPageScore.cs	Merge remote-tracking branch 'upstream/master' into results-screen	2017-04-19 20:51:05 +09:00