Dean Herbert 9a8003f6fa Merge remote-tracking branch 'refs/remotes/upstream/master' into project-restructure ... # Conflicts: # osu.Game/Beatmaps/Objects/Osu/OsuBaseHit.cs		2016-11-14 22:08:30 +09:00
..
Options	Merge remote-tracking branch 'refs/remotes/upstream/master' into options-sidebar-tracking	2016-11-12 22:30:15 +09:00
ChatConsole.cs	Merge branch 'refs/heads/master' into dependency-injection	2016-11-12 20:18:26 +09:00
DragBar.cs	Seperated DragBar class.	2016-10-27 18:14:50 +08:00
MusicController.cs	Account for anchor when dragging MusicController (fixes VisualTest).	2016-11-14 16:40:13 +09:00
OptionsOverlay.cs	Merge remote-tracking branch 'refs/remotes/upstream/master' into options-sidebar-tracking	2016-11-12 22:30:15 +09:00
Toolbar.cs	Move play modes to Modes namespace.	2016-11-14 18:03:20 +09:00
ToolbarButton.cs	Modify toolbar tooltips to be closer to design.	2016-11-09 15:24:19 +09:00
ToolbarModeButton.cs	Move play modes to Modes namespace.	2016-11-14 18:03:20 +09:00
ToolbarModeSelector.cs	Move play modes to Modes namespace.	2016-11-14 18:03:20 +09:00