Dean Herbert 4430255ec4 Merge remote-tracking branch 'upstream/master' into replay ... # Conflicts: # osu.Desktop.VisualTests/Tests/TestCasePlayer.cs # osu.Desktop/OsuGameDesktop.cs # osu.Game.Modes.Osu/Objects/Drawables/DrawableHitCircle.cs # osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs # osu.Game/Database/BeatmapDatabase.cs # osu.Game/Graphics/Cursor/OsuCursorContainer.cs # osu.Game/IPC/BeatmapImporter.cs # osu.Game/Modes/Mod.cs # osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs # osu.Game/Modes/UI/Playfield.cs # osu.Game/Screens/Play/Player.cs # osu.Game/Screens/Play/PlayerInputManager.cs		2017-03-07 13:50:08 +09:00
..
Platform	Fix most warnings.	2017-03-07 13:05:57 +09:00
Tests	Merge remote-tracking branch 'upstream/master' into replay	2017-03-07 13:50:08 +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	Fix most warnings.	2017-03-07 13:05:57 +09:00