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
..
Beatmaps	Merge remote-tracking branch 'upstream/master' into replay	2017-03-07 13:50:08 +09:00
Resources	Add/update license headers.	2017-02-14 18:17:35 +09:00
app.config	Add/update license headers.	2017-02-14 18:17:35 +09:00
OpenTK.dll.config	Add/update license headers.	2017-02-14 18:17:35 +09:00
osu.Game.Tests.csproj	Update nuget packages.	2017-02-27 20:38:30 +09:00
packages.config	Update nuget packages.	2017-02-27 20:38:30 +09:00