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/IO	Fix most warnings.	2017-03-07 13:05:57 +09:00
Overlays	Fix most warnings.	2017-03-07 13:05:57 +09:00
Properties	Remove unnecessary using statements	2017-02-23 21:38:10 +01:00
OsuGameDesktop.cs	Merge remote-tracking branch 'upstream/master' into replay	2017-03-07 13:50:08 +09:00
Program.cs	Change IPC to make sense.	2017-03-04 18:51:16 +09:00
app.config	Update nuget packages.	2017-02-27 20:38:30 +09:00
lazer.ico	Initial commit.	2016-08-26 14:41:47 +09:00
osu!.res	Update res file with latest manifest.	2016-11-14 04:47:08 +08:00
osu.Desktop.csproj	wankoz	2017-03-01 22:56:20 +09:00
osu.nuspec	Fix missing .config files from nuspec.	2017-03-05 02:48:44 +09:00
packages.config	wankoz	2017-03-01 22:56:20 +09:00