smoogipoo 9924f518b7 Merge remote-tracking branch 'origin/master' into UselessToucan/EfCore ... # Conflicts: # osu-framework # osu.Game/Beatmaps/BeatmapMetadata.cs # osu.Game/osu.Game.csproj # osu.Game/packages.config		2017-10-14 16:36:37 +09:00
..
Backgrounds	…
Charts	…
Direct	…
Edit	Use Gray instead of FromHex for grays	2017-10-12 22:19:29 +09:00
Menu	Let's not rename columns yet	2017-10-14 14:30:58 +09:00
Multiplayer	Rework EF Core usage in model classes	2017-10-06 00:23:26 +03:00
Play	Let's not rename columns yet	2017-10-14 14:30:58 +09:00
Ranking	Rework EF Core usage in model classes	2017-10-06 00:23:26 +03:00
Select	Let's not rename columns yet	2017-10-14 14:30:58 +09:00
Tournament	…
BackgroundScreen.cs	…
Loader.cs	…
OsuScreen.cs	…
ScreenWhiteBox.cs	…