Dean Herbert 471b9daa93 Merge branch 'master' into mod-overlay ... # Conflicts: # osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj # osu.Game/Screens/Select/PlaySongSelect.cs # osu.Game/osu.Game.csproj		2017-03-02 20:27:04 +09:00
..
Dialog	More code tidying.	2017-03-02 17:14:05 +09:00
Mods	Merge branch 'master' into mod-overlay	2017-03-02 20:27:04 +09:00
Notifications	FlowDirection -> FillDirection	2017-03-01 20:15:38 +01:00
Options	FlowDirection -> FillDirection	2017-03-01 20:15:38 +01:00
Pause	Merge branch 'master' into popup-dialog	2017-03-02 16:42:20 +09:00
Toolbar	Merge branch 'master' into mod-overlay	2017-03-02 20:27:04 +09:00
ChatOverlay.cs	Removed unused variables and parameters	2017-02-27 17:32:32 +03:00
DialogOverlay.cs	Fix incorrect event order.	2017-03-02 17:41:33 +09: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	Removed unused variables and parameters	2017-02-27 17:32:32 +03:00
NotificationManager.cs	FlowDirection -> FillDirection	2017-03-01 20:15:38 +01:00
OptionsOverlay.cs	FlowDirection -> FillDirection	2017-03-01 20:15:38 +01:00
WaveOverlayContainer.cs	Updated to work with latest framework	2017-02-28 02:25:38 -04:00