Dean Herbert 976cff9af6 Merge remote-tracking branch 'upstream/master' into catch ... # Conflicts: # osu.Desktop.Tests/Visual/TestCaseScrollingPlayfield.cs		2017-08-09 15:08:43 +09:00
..
ModIcon.cs	Fix alignment of icons on mod buttons	2017-08-07 08:54:53 +09:00
Playfield.cs	Use CompositeDrawable for HitObjectContainer. Removes a looooooot of generics 👍.	2017-08-08 17:37:11 +09:00
RulesetContainer.cs	Merge remote-tracking branch 'upstream/master' into catch	2017-08-09 15:08:43 +09:00
ScrollingPlayfield.cs	Applied suggested changes.	2017-08-09 14:24:47 +09:00
ScrollingRulesetContainer.cs	HitRenderer -> RulesetContainer	2017-08-09 13:28:29 +09:00