Dean Herbert 4430255ec4 Merge remote-tracking branch 'upstream/master' into replay ... # Conflicts: # osu.Desktop.VisualTests/Tests/TestCasePlayer.cs # osu.Desktop/OsuGameDesktop.cs # osu.Game.Modes.Osu/Objects/Drawables/DrawableHitCircle.cs # osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs # osu.Game/Database/BeatmapDatabase.cs # osu.Game/Graphics/Cursor/OsuCursorContainer.cs # osu.Game/IPC/BeatmapImporter.cs # osu.Game/Modes/Mod.cs # osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs # osu.Game/Modes/UI/Playfield.cs # osu.Game/Screens/Play/Player.cs # osu.Game/Screens/Play/PlayerInputManager.cs		2017-03-07 13:50:08 +09:00
..
Dialog	Remove unnecessary usings	2017-03-04 19:43:59 +01:00
Mods	Merge remote-tracking branch 'upstream/master' into replay	2017-03-07 13:50:08 +09:00
Notifications	Fix most warnings.	2017-03-07 13:05:57 +09:00
Options	Fix most warnings.	2017-03-07 13:05:57 +09:00
Toolbar	Fix most warnings.	2017-03-07 13:05:57 +09:00
ChatOverlay.cs	Fix most warnings.	2017-03-07 13:05:57 +09:00
DialogOverlay.cs	Remove unnecessary usings	2017-03-04 19:43:59 +01:00
DragBar.cs	Fix most warnings.	2017-03-07 13:05:57 +09:00
LoginOverlay.cs	Fix most warnings.	2017-03-07 13:05:57 +09:00
MusicController.cs	Fix most warnings.	2017-03-07 13:05:57 +09:00
NotificationManager.cs	Fix most warnings.	2017-03-07 13:05:57 +09:00
OptionsOverlay.cs	Add options footer.	2017-03-06 17:30:46 +09:00
WaveOverlayContainer.cs	Merge branch 'master' into replay	2017-03-07 11:41:16 +09:00