Commit Graph

3 Commits

Author SHA1 Message Date
Dean Herbert 36cfe54e59 Missing namespace. 2017-02-03 13:16:45 +09:00
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
Dean Herbert 3e7503e860 Make skip button work. 2017-01-27 21:57:22 +09:00