smoogipoo 70f1d17b7e Merge remote-tracking branch 'origin/master' into editor-mask-placement ... # Conflicts: # osu.Game.Rulesets.Catch/UI/CatchRulesetContainer.cs # osu.Game.Rulesets.Mania/Edit/ManiaEditRulesetContainer.cs # osu.Game.Rulesets.Osu/Edit/OsuEditRulesetContainer.cs # osu.Game/Rulesets/UI/RulesetContainer.cs		2018-10-16 17:28:16 +09:00
..
Audio
Beatmaps	Merge remote-tracking branch 'origin/master' into editor-mask-placement	2018-10-16 17:28:16 +09:00
Configuration	Remove ScrollingVisualisation from settings	2018-09-19 18:30:25 +02:00
Database	Remove unnecessary comment	2018-09-26 18:41:55 +09:00
Graphics	Merge remote-tracking branch 'upstream/master' into smooth-path	2018-10-12 16:03:36 +09:00
Input	Merge branch 'master' into consistent-terminology-format	2018-10-10 19:19:36 +09:00
IO
IPC	Use invariant tolower	2018-09-26 18:44:03 +09:00
Migrations	add status column to BeatmapInfo + BeatmapSetInfo	2018-09-13 10:10:58 +02:00
Online	Fix outdated API variable	2018-09-28 19:33:30 +09:00
Overlays	Merge branch 'master' into debounce-seeks	2018-10-12 17:50:39 +09:00
Properties
Rulesets	Merge remote-tracking branch 'origin/master' into editor-mask-placement	2018-10-16 17:28:16 +09:00
Screens	Merge remote-tracking branch 'origin/master' into editor-mask-placement	2018-10-16 17:28:16 +09:00
Skinning	Update framework	2018-09-07 19:00:43 +09:00
Storyboards	Merge branch 'master' into consistent-terminology-format	2018-10-10 19:19:36 +09:00
Tests	Adapt signature change of event handlers	2018-10-02 12:02:55 +09:00
Users	Fix last visit not supporting null values	2018-10-05 00:25:40 +09:00
Utils
osu!.res
osu.Game.csproj	Update nuget dependencies (version mismatches)	2018-10-12 18:51:51 +09:00
OsuGame.cs	Fix cursor not hiding in screenshots	2018-10-02 10:12:07 +09:00
OsuGameBase.cs	Merge pull request #3478 from peppy/fix-case-sensitivity-import-extensions	2018-09-26 19:40:00 +09:00