Thomas Müller 07e74068e7 Merge branch 'master' of github.com:ppy/osu into peppy/hitcircle-revision-2 ... # Conflicts: # osu.Desktop.VisualTests/Tests/TestCasePlayer.cs # osu.Game/Beatmaps/Objects/Osu/Drawable/DrawableCircle.cs		2016-11-05 13:35:15 +01:00
..
Platform	Remove unnecessary directory creation.	2016-10-27 17:33:17 +09:00
Tests	Merge branch 'master' of github.com:ppy/osu into peppy/hitcircle-revision-2	2016-11-05 13:35:15 +01:00
OpenTK.dll.config	Implement General options section	2016-11-03 19:06:22 -04:00
osu.Desktop.VisualTests.csproj	Fix OpenTK reference in osu.Desktop.VisualTests	2016-11-03 19:06:22 -04:00
packages.config	Fix OpenTK reference in osu.Desktop.VisualTests	2016-11-03 19:06:22 -04:00
Program.cs
VisualTestGame.cs	Add async workflow.	2016-11-01 23:24:14 +09:00