Dean Herbert cc0f61f545 Merge branch 'refs/heads/master' into dependency-injection ... # Conflicts: # osu-framework # osu.Game/GameModes/OsuGameMode.cs # osu.Game/GameModes/Play/Player.cs # osu.Game/OsuGame.cs # osu.Game/Overlays/MusicController.cs # osu.Game/Overlays/Options/EditorSection.cs # osu.Game/Overlays/Options/Input/MouseOptions.cs # osu.Game/Overlays/Options/Online/InGameChatOptions.cs # osu.Game/Overlays/Options/SkinSection.cs		2016-11-12 20:18:26 +09:00
..
Backgrounds	Merge branch 'refs/heads/master' into dependency-injection	2016-11-12 20:18:26 +09:00
Charts	Basic white-boxing of all game modes.	2016-09-29 23:51:17 +09:00
Direct	Basic white-boxing of all game modes.	2016-09-29 23:51:17 +09:00
Edit	Schedule some illegal calls.	2016-11-02 01:02:34 +09:00
Menu	Merge branch 'refs/heads/master' into dependency-injection	2016-11-12 20:18:26 +09:00
Multiplayer	Schedule some illegal calls.	2016-11-02 01:02:34 +09:00
Play	Merge branch 'refs/heads/master' into dependency-injection	2016-11-12 20:18:26 +09:00
Ranking	Schedule some illegal calls.	2016-11-02 01:02:34 +09:00
BackgroundMode.cs	Merge branch 'refs/heads/master' into dependency-injection	2016-11-12 20:18:26 +09:00
GameModeWhiteBox.cs	Merge branch 'refs/heads/master' into dependency-injection	2016-11-12 20:18:26 +09:00
OsuGameMode.cs	Merge branch 'refs/heads/master' into dependency-injection	2016-11-12 20:18:26 +09:00