Merge branch 'master' into results-screen

# Conflicts:
#	osu.Game/Rulesets/Replays/Replay.cs
This commit is contained in:
Dean Herbert
2017-04-19 16:25:31 +09:00
5 changed files with 8 additions and 9 deletions

View File

@ -8,8 +8,10 @@ namespace osu.Game.Rulesets.Replays
{
public class Replay
{
protected const double KEY_UP_DELAY = 50;
public User User;
public List<ReplayFrame> Frames = new List<ReplayFrame>();
}
}
}