Dean Herbert 482a01e7ba Merge branch 'master' into tournament-tools ...

# Conflicts:
#	osu.Game/Online/API/Requests/Responses/APIBeatmap.cs
#	osu.Game/OsuGameBase.cs
#	osu.Game/Overlays/ChatOverlay.cs
#	osu.Game/Screens/Menu/MainMenu.cs
#	osu.Game/Screens/Tournament/Drawings.cs
#	osu.Game/Screens/Tournament/Teams/DrawingsTeam.cs
#	osu.Game/osu.Game.csproj
#	osu.sln

482a01e7ba · 2019-02-02 19:09:48 +09:00

History

..

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

Merge branch 'master' into tournament-tools

2019-02-02 19:09:48 +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

Merge branch 'master' into tournament-tools

2019-02-02 19:09:48 +09:00