smoogipoo 772bef91fa Merge remote-tracking branch 'Joehuu/master' into drawnode-composability ... # Conflicts: # osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs		2019-04-08 23:01:12 +09:00
..
GlobalKeyBindingsSection.cs	Update font awesome usage	2019-04-02 19:55:24 +09:00
KeyBindingRow.cs	Adjust namespaces	2019-04-02 14:51:28 +09:00
KeyBindingsSubsection.cs	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00
RulesetBindingsSection.cs	Update icon usage to match framework changes	2019-03-27 19:29:27 +09:00
VariantBindingsSubsection.cs	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00