Dean Herbert 7ce5fc08ee Merge branch 'master' into skip-button ... # Conflicts: # osu.Game/Graphics/UserInterface/BackButton.cs # osu.Game/Screens/Play/Player.cs # osu.Game/osu.Game.csproj		2017-02-01 14:05:58 +09:00
..
FailDialog.cs	Add fail dialog and flow.	2017-01-27 00:41:34 +09:00
KeyCounter.cs	Make skip button work.	2017-01-27 21:57:22 +09:00
KeyCounterCollection.cs	Make skip button work.	2017-01-27 21:57:22 +09:00
KeyCounterKeyboard.cs	Make skip button work.	2017-01-27 21:57:22 +09:00
KeyCounterMouse.cs	Make skip button work.	2017-01-27 21:57:22 +09:00
ModSelect.cs	Rename GameModes namespace to Screens.	2016-11-14 17:23:33 +09:00
Player.cs	Merge branch 'master' into skip-button	2017-02-01 14:05:58 +09:00
PlayerInputManager.cs	Move PlayerInputManager to own file.	2017-01-27 00:38:21 +09:00
SkipButton.cs	Make skip button work.	2017-01-27 21:57:22 +09:00