smoogipoo 91302ea0bc Merge remote-tracking branch 'origin/master' into iscreen ...

# Conflicts:
#	osu.Game/Screens/Multi/Match/MatchSubScreen.cs
#	osu.Game/Screens/Multi/Multiplayer.cs
#	osu.Game/Screens/Multi/MultiplayerSubScreen.cs
#	osu.Game/Screens/OsuScreen.cs
#	osu.Game/osu.Game.csproj
#	osu.sln

2019-01-29 21:21:36 +09:00

..

Overlays

Update licence header (and remove year)

2019-01-24 17:43:03 +09:00

Updater

Update licence header (and remove year)

2019-01-24 17:43:03 +09:00

lazer.ico

Add back osu.Desktop project

2017-10-14 14:33:05 +09:00

osu!.res

Add back osu.Desktop project

2017-10-14 14:33:05 +09:00

osu.Desktop.csproj

Update framework and other nuget packages

2019-01-16 10:14:37 +09:00

osu.nuspec

Standardise remaining cases

2019-01-24 18:24:30 +09:00

OsuGameDesktop.cs

Merge remote-tracking branch 'origin/master' into iscreen

2019-01-29 21:21:36 +09:00

Program.cs

Update licence header (and remove year)

2019-01-24 17:43:03 +09:00