smoogipoo ffa712dccb Fix post-merge issues		2018-03-24 15:19:45 +09:00
..
Overlays	Merge branch 'master' into update-branch	2018-02-08 23:35:48 +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 OpenTK version	2018-02-06 13:47:54 +09:00
osu.nuspec	Update nuspec to include humanizer localisations	2018-03-21 22:32:10 +09:00
OsuGameDesktop.cs	Merge remote-tracking branch 'origin/master' into netstandard	2018-03-24 14:49:46 +09:00
OsuTestBrowser.cs	Update licence headers	2018-01-05 20:21:19 +09:00
Program.cs	Fix post-merge issues	2018-03-24 15:19:45 +09:00