sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-03 01:09:57 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:ppy/osu into better-transforms

Browse Source 
# Conflicts:
#	osu-framework
This commit is contained in:
Thomas Müller
2017-07-19 19:15:51 +02:00
parent 3ba119c115 a7d4a3d473
commit c4619f614a
31 changed files with 380 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Overlays/ChatOverlay.cs
View File

@ -111,7 +111,7 @@ namespace osu.Game.Overlays
RelativeSizeAxes = Axes.Both,
Padding = new MarginPadding
{
Bottom = textbox_height + padding
Bottom = textbox_height
},
},
new Container