h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-12 16:02:55 +08:00
Code Issues Releases Wiki Activity
d46e68b36b
osu-lazer/osu.Desktop
History
Thomas Müller d46e68b36b Merge branch 'master' of github.com:ppy/osu into flowcontainer-refactor 
# Conflicts:
#	osu-framework
#	osu.Game/Beatmaps/Drawables/BeatmapGroup.cs
2017-03-01 18:05:58 +01:00
..
Beatmaps/IO Remove unnecessary using statements 2017-02-23 21:38:10 +01:00
Overlays Merge branch 'master' of github.com:ppy/osu into flowcontainer-refactor 2017-03-01 18:05:58 +01: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 Update nuget packages. 2017-02-27 20:38:30 +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 Update nuget packages. 2017-02-27 20:38:30 +09:00
Program.cs Update with framework structural changes. 2017-02-26 20:54:32 +09:00