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
..
Audio	move stuff thats duplicated in PreviewButton and DirectPanel to PlayButton	2017-10-06 21:02:00 +02:00
Beatmaps	Merge remote-tracking branch 'origin/master' into UselessToucan/EfCore	2017-10-14 16:36:37 +09:00
Configuration	Merge branch 'master' into storyboard_integration	2017-09-22 12:45:34 +02:00
Database	Add logging	2017-10-14 15:16:08 +09:00
Graphics	Merge remote-tracking branch 'upstream/master' into ranks-section	2017-10-13 18:49:05 +09:00
Input	Let's not rename columns yet	2017-10-14 14:30:58 +09:00
IO	Let's not rename columns yet	2017-10-14 14:30:58 +09:00
IPC
Migrations	Add logging	2017-10-14 15:16:08 +09:00
Online	Let's not rename columns yet	2017-10-14 14:30:58 +09:00
Overlays	Merge branch 'master' into back-to-desktop	2017-10-14 16:18:28 +09:00
Properties	Standardise AssemblyInfos	2017-10-14 15:02:20 +09:00
Resources
Rulesets	Let's not rename columns yet	2017-10-14 14:30:58 +09:00
Screens	Merge remote-tracking branch 'origin/master' into UselessToucan/EfCore	2017-10-14 16:36:37 +09:00
Storyboards	Rework EF Core usage in model classes	2017-10-06 00:23:26 +03:00
Tests	Merge remote-tracking branch 'origin/master' into UselessToucan/EfCore	2017-10-14 16:36:37 +09:00
Users
app.config
OpenTK.dll.config
osu!.res
osu.Game.csproj	Merge remote-tracking branch 'origin/master' into UselessToucan/EfCore	2017-10-14 16:36:37 +09:00
osu.nuspec
OsuGame.cs	Let's not rename columns yet	2017-10-14 14:30:58 +09:00
OsuGameBase.cs	Let's not rename columns yet	2017-10-14 14:30:58 +09:00
packages.config	Merge remote-tracking branch 'origin/master' into UselessToucan/EfCore	2017-10-14 16:36:37 +09:00