Dean Herbert 435e845067 Merge branch 'master' into DrabWeb/song-progress-graph ... # Conflicts: # osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj # osu.Game/Overlays/Pause/PauseProgressBar.cs # osu.Game/Overlays/Pause/PauseProgressGraph.cs # osu.Game/osu.Game.csproj		2017-03-02 20:20:27 +09:00
..
Platform	Update and standardise license headers.	2017-02-07 14:27:41 +09:00
Tests	Merge branch 'master' into DrabWeb/song-progress-graph	2017-03-02 20:20:27 +09:00
app.config	Add/update license headers.	2017-02-14 18:17:35 +09:00
Benchmark.cs	Removed unused variables and parameters	2017-02-27 17:32:32 +03:00
OpenTK.dll.config	Add/update license headers.	2017-02-14 18:17:35 +09:00
osu.Desktop.VisualTests.csproj	Merge branch 'master' into DrabWeb/song-progress-graph	2017-03-02 20:20:27 +09:00
packages.config	Update nuget packages.	2017-02-27 20:38:30 +09:00
Program.cs	Update with framework structural changes.	2017-02-26 20:54:32 +09:00
VisualTestGame.cs	Merge remote-tracking branch 'upstream/master' into remove-usings	2017-02-24 11:29:34 +09:00