Lucas A 7f5cf04b2b Fix merge conflicts.		2020-10-07 13:28:49 +02:00
..
Audio
Beatmaps	Fix merge conflicts.	2020-10-07 13:28:49 +02:00
Collections
Configuration	Make SettingsItem conform to IHasCurrentValue	2020-10-06 17:33:50 +09:00
Database	User IEnumerable for HandledExtensions	2020-10-02 16:17:10 +09:00
Extensions
Graphics	Add the most basic implementation of LabelledSliderBar feasible	2020-10-06 17:33:50 +09:00
Input
IO
IPC
Migrations
Online
Overlays	Add obsoleted Bindable property back to SettingsItem for compatibility	2020-10-06 19:07:31 +09:00
Properties
Replays
Rulesets	Merge pull request #10338 from Game4all/perf-calculator-remove-working-beatmap	2020-10-07 20:04:24 +09:00
Scoring	Fix merge conflicts.	2020-10-07 13:28:49 +02:00
Screens	Fix merge conflicts.	2020-10-07 13:28:49 +02:00
Skinning	Merge branch 'master' into editor-file-drop-support	2020-10-05 17:48:06 +09:00
Storyboards
Tests
Updater	Add update notifications for iOS builds	2020-10-06 13:19:52 +09:00
Users
Utils
osu!.res
osu.Game.csproj	Update framework	2020-10-04 23:47:47 +09:00
OsuGame.cs
OsuGameBase.cs	Fix merge conflicts.	2020-10-07 13:28:49 +02:00