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
..
Beatmaps/IO	Remove unnecessary using statements	2017-02-23 21:38:10 +01:00
Overlays	Log errors with updating.	2017-03-03 18:09:38 +09:00
Properties	Remove unnecessary using statements	2017-02-23 21:38:10 +01: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	Exclude vshost executables from packages.	2017-02-13 21:33:48 +09:00
OsuGameDesktop.cs	Make beatmap importing async.	2017-02-24 18:12:50 +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