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
..
BeatmapInfoWedge.cs	Global shadows and more sane font size setting.	2017-01-31 18:53:52 +09:00
CarouselContainer.cs	Fix keyboard controls not respecting search filter.	2017-02-02 19:37:35 +09:00
EditSongSelect.cs
FilterControl.cs	Use OnChange instead of OnCommit	2017-02-01 19:12:24 -05:00
Footer.cs	Initial implementation of song select footer area.	2017-01-27 00:36:12 +09:00
FooterButton.cs	Global shadows and more sane font size setting.	2017-01-31 18:53:52 +09:00
MatchSongSelect.cs
PlaySongSelect.cs	@Tom94 pointed out this problem	2017-02-02 12:23:06 -05:00
SearchTextBox.cs	Fix escape key to exit PlaySongSelect	2017-01-31 19:00:54 -05:00