smoogipoo 5862eb172a Merge remote-tracking branch 'origin/master' into fix-zero-length-sliders ... # Conflicts: # osu.Game/Rulesets/Objects/Legacy/Catch/ConvertHitObjectParser.cs # osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs # osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHitObjectParser.cs # osu.Game/Rulesets/Objects/Legacy/Osu/ConvertHitObjectParser.cs # osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertHitObjectParser.cs		2019-07-05 15:48:04 +09:30
..
Audio	Fix skinning support for combobreak	2019-06-30 21:58:30 +09:00
Beatmaps	Fix weird merge conflict	2019-07-02 23:21:13 +09:00
Configuration
Database	Add database statistics to GlobalStatistics	2019-07-02 13:43:43 +09:00
Graphics	Fix file ordering	2019-07-05 10:07:45 +09:00
Input
IO
IPC
Migrations
Online	Fix incorrect xmldoc in DownloadTrackingComposite (#5261)	2019-07-05 14:43:28 +09:00
Overlays	Merge branch 'master' into direct-ruleset-selector	2019-07-04 00:56:36 +09:00
Properties
Replays
Rulesets	Merge remote-tracking branch 'origin/master' into fix-zero-length-sliders	2019-07-05 15:48:04 +09:30
Scoring	Move replay button to score card	2019-06-29 10:55:30 +05:30
Screens	Merge branch 'master' into fade-music-on-exit	2019-07-05 13:13:07 +09:00
Skinning	Fix typo	2019-07-01 23:26:53 +09:30
Storyboards
Tests	Fix test StackOverflows	2019-06-27 14:08:58 +09:00
Users
Utils
osu!.res
osu.Game.csproj	Update framework	2019-07-04 00:34:39 +09:00
OsuGame.cs	Merge branch 'master' into watch-replays-4	2019-07-03 11:47:10 +09:00
OsuGameBase.cs	Merge branch 'master' into watch-replays-4	2019-07-02 13:24:16 +09:00