Merge branch 'master' into sharpen

This commit is contained in:
Huo Yaoyuan
2019-11-20 17:30:58 +08:00
54 changed files with 282 additions and 114 deletions

View File

@ -351,7 +351,7 @@ namespace osu.Game.Screens.Select
/// <summary>
/// Half the height of the visible content.
/// <remarks>
/// This is different from the height of <see cref="ScrollContainer{T}.displayableContent"/>, since
/// This is different from the height of <see cref="ScrollContainer{T}"/>.displayableContent, since
/// the beatmap carousel bleeds into the <see cref="FilterControl"/> and the <see cref="Footer"/>
/// </remarks>
/// </summary>