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
..
LanguageSettings.cs	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00
LoginSettings.cs	Merge remote-tracking branch 'Joehuu/master' into drawnode-composability	2019-04-08 23:01:12 +09:00
UpdateSettings.cs	Fix warnings	2019-02-28 18:59:05 +09:00