Dean Herbert 9e1383fa48 Merge remote-tracking branch 'upstream/master' into replay ... # Conflicts: # osu.Game.Modes.Catch/CatchRuleset.cs # osu.Game.Modes.Mania/ManiaRuleset.cs # osu.Game.Modes.Taiko/TaikoRuleset.cs # osu.Game/Screens/Play/Player.cs		2017-03-04 13:17:01 +09:00
..
Platform	Update and standardise license headers.	2017-02-07 14:27:41 +09:00
Tests	Merge remote-tracking branch 'upstream/master' into replay	2017-03-04 13:17:01 +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 remote-tracking branch 'upstream/master' into replay	2017-03-04 13:17:01 +09:00
packages.config	wankoz	2017-03-01 22:56:20 +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