Dean Herbert 16a01abc4d Merge remote-tracking branch 'upstream/master' into options-refactor ... # Conflicts: # osu.Game/Beatmaps/Drawables/BeatmapPanel.cs # osu.Game/Graphics/UserInterface/BackButton.cs # osu.Game/Screens/Play/KeyCounter.cs		2017-02-03 13:16:07 +09:00
..
Options	Sidebar button style pass.	2017-01-31 19:58:38 +09:00
Pause	Merge branch 'master' into song-select-filtering	2017-02-02 09:25:27 -08:00
Toolbar	Global shadows and more sane font size setting.	2017-01-31 18:53:52 +09:00
ChatOverlay.cs	Global shadows and more sane font size setting.	2017-01-31 18:53:52 +09:00
DragBar.cs	IsEnabled property for drag bar of music controller.	2016-12-01 08:20:24 +08:00
LoginOverlay.cs	Colour conformity pass.	2017-01-31 19:40:02 +09:00
MusicController.cs	Global shadows and more sane font size setting.	2017-01-31 18:53:52 +09:00
OptionsOverlay.cs	Sidebar button style pass.	2017-01-31 19:58:38 +09:00