Dean Herbert 4e4408cd20 Merge branch 'master' into replay ... # Conflicts: # osu.Desktop.VisualTests/Tests/TestCasePlayer.cs		2017-03-05 17:45:03 +09:00
..
Dialog	Remove unnecessary usings	2017-03-04 19:43:59 +01:00
Mods	Remove unnecessary usings	2017-03-04 19:43:59 +01:00
Notifications	Use Color4Extensions from Framework and remove redundant Name	2017-03-04 19:42:37 +01:00
Options	Remove unnecessary usings	2017-03-04 19:43:59 +01:00
Toolbar	Remove unnecessary usings	2017-03-04 19:43:59 +01:00
ChatOverlay.cs	Removed unused variables and parameters	2017-02-27 17:32:32 +03:00
DialogOverlay.cs	Remove unnecessary usings	2017-03-04 19:43:59 +01:00
DragBar.cs	Update and standardise license headers.	2017-02-07 14:27:41 +09:00
LoginOverlay.cs	Update framework	2017-02-26 11:22:58 +09:00
MusicController.cs	Remove unnecessary usings	2017-03-04 19:43:59 +01:00
NotificationManager.cs	Remove unnecessary usings	2017-03-04 19:43:59 +01:00
OptionsOverlay.cs	Update usage of FillDirection	2017-03-04 11:00:17 +01:00
WaveOverlayContainer.cs	Merge branch 'master' into replay	2017-03-05 17:45:03 +09:00