Dean Herbert 3dbf4879c7 Merge branch 'music-controller-improvements' into song-progress-graph ... # Conflicts: # osu.Game/Overlays/DragBar.cs		2017-04-07 15:18:58 +09:00
..
Beatmaps	Remove all trailing whitespaces in this repo.	2017-04-06 16:21:18 +08:00
Platform	Remove all trailing whitespaces in this repo.	2017-04-06 16:21:18 +08:00
Tests	Merge branch 'music-controller-improvements' into song-progress-graph	2017-04-07 15:18:58 +09:00
AutomatedVisualTestGame.cs	Fix nullref.	2017-03-31 18:05:24 +09:00
OpenTK.dll.config	Add/update license headers.	2017-02-14 18:17:35 +09:00
Program.cs	Bring VisualTests up-to-date.	2017-03-31 18:00:14 +09:00
VisualTestGame.cs	Update async load usage to new style.	2017-04-02 15:56:12 +09:00
osu.Desktop.VisualTests.csproj	Merge remote-tracking branch 'upstream/master' into song-progress-graph	2017-04-07 09:22:18 +09:00
packages.config	Add license headers.	2017-03-14 13:02:42 +09:00