Dean Herbert 7ce5fc08ee Merge branch 'master' into skip-button ... # Conflicts: # osu.Game/Graphics/UserInterface/BackButton.cs # osu.Game/Screens/Play/Player.cs # osu.Game/osu.Game.csproj		2017-02-01 14:05:58 +09:00
..
Platform	Add missing licence headers.	2016-12-06 19:07:15 +09:00
Tests	Merge branch 'master' into skip-button	2017-02-01 14:05:58 +09:00
OpenTK.dll.config	Add missing licence headers.	2016-12-06 19:07:15 +09:00
Program.cs	Allow visualtests to share config etc. with osu!.	2017-01-27 00:39:00 +09:00
VisualTestGame.cs	Add missing licence headers.	2016-12-06 19:07:15 +09:00
osu.Desktop.VisualTests.csproj	Merge branch 'master' into skip-button	2017-02-01 14:05:58 +09:00
packages.config	Add missing licence headers.	2016-12-06 19:07:15 +09:00