Dean Herbert abdfe42388 Merge branch 'refs/heads/master' into better-anchors ... # Conflicts: # osu.Game.Mode.Osu/UI/OsuComboCounter.cs # osu.Game.Mode.Osu/UI/OsuScoreOverlay.cs		2016-11-15 14:33:13 +09:00
..
Platform	Move play modes to their own projects.	2016-11-14 18:54:24 +09:00
Tests	Merge branch 'refs/heads/master' into better-anchors	2016-11-15 14:33:13 +09:00
OpenTK.dll.config	Implement General options section	2016-11-03 19:06:22 -04:00
osu.Desktop.VisualTests.csproj	Move play modes to their own projects.	2016-11-14 18:54:24 +09: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	Move play modes to their own projects.	2016-11-14 18:54:24 +09:00