Dean Herbert 62c5ad907a Merge remote-tracking branch 'upstream/master' into login-updates ... # Conflicts: # osu.Game/Overlays/Options/General/LoginOptions.cs		2017-01-31 17:05:33 +09:00
..
GeneralSection.cs	Move login screen to toolbar and update design (still not fully implemented).	2017-01-30 22:55:35 +09:00
LanguageOptions.cs	Add missing licence headers.	2016-12-06 19:07:15 +09:00
LoginOptions.cs	Merge remote-tracking branch 'upstream/master' into login-updates	2017-01-31 17:05:33 +09:00
UpdateOptions.cs	Switch to System.ComponentModel.Description	2016-12-07 09:42:53 -05:00