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
..
Options	Fix most warnings.	2017-03-07 13:05:57 +09:00
BeatmapDeleteDialog.cs	Fix most warnings.	2017-03-07 13:05:57 +09:00
BeatmapInfoWedge.cs	Fix most warnings.	2017-03-07 13:05:57 +09:00
CarouselContainer.cs	Fix most warnings.	2017-03-07 13:05:57 +09:00
EditSongSelect.cs	Fix most warnings.	2017-03-07 13:05:57 +09:00
FilterControl.cs	Update framework (and fix non-conforming anchors in FillFlowContainers).	2017-03-04 23:24:13 +09:00
Footer.cs	Remove unnecessary usings	2017-03-04 19:43:59 +01:00
FooterButton.cs	Update framework	2017-02-26 11:22:58 +09:00
MatchSongSelect.cs	Fix most warnings.	2017-03-07 13:05:57 +09:00
PlaySongSelect.cs	Merge remote-tracking branch 'upstream/master' into replay	2017-03-07 13:50:08 +09:00
SearchTextBox.cs	SearchTextBox should not handle shift-delete.	2017-02-24 11:44:40 +09:00
WedgeBackground.cs	Remove unnecessary usings	2017-03-04 19:43:59 +01:00