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
..
Platform	Remove unnecessary directory creation.	2016-10-27 17:33:17 +09:00
Tests	Merge branch 'refs/heads/master' into dependency-injection	2016-11-12 20:18:26 +09:00
OpenTK.dll.config	Implement General options section	2016-11-03 19:06:22 -04:00
osu.Desktop.VisualTests.csproj	Merge branch 'master'	2016-11-05 16:21:59 +08:00
packages.config	Fix OpenTK reference in osu.Desktop.VisualTests	2016-11-03 19:06:22 -04:00
Program.cs	Wire up one of the settings to the config	2016-11-07 22:36:24 -05:00
VisualTestGame.cs	Merge branch 'refs/heads/master' into dependency-injection	2016-11-12 20:18:26 +09:00