Merge remote-tracking branch 'upstream/master' into archive-reader

This commit is contained in:
Alex Amadori
2017-03-08 21:54:17 +01:00
44 changed files with 175 additions and 105 deletions

View File

@ -1,5 +1,5 @@
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu-framework/master/LICENCE
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System.Collections.Generic;
using osu.Framework.Screens.Testing;