diff --git a/osu-framework b/osu-framework index 58dc740ca6..16f8982811 160000 --- a/osu-framework +++ b/osu-framework @@ -1 +1 @@ -Subproject commit 58dc740ca6277c407a6ce71d304de954527bc3ac +Subproject commit 16f8982811293efbf99bb409da97ecb591553b70 diff --git a/osu.Desktop/Program.cs b/osu.Desktop/Program.cs index 43e2c3a2e8..5144ce4076 100644 --- a/osu.Desktop/Program.cs +++ b/osu.Desktop/Program.cs @@ -1,5 +1,5 @@ //Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT License - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System; using osu.Framework.Desktop; diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs index 2ac7a500ed..5f39925307 100644 --- a/osu.Game/Configuration/OsuConfigManager.cs +++ b/osu.Game/Configuration/OsuConfigManager.cs @@ -1,5 +1,5 @@ //Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT License - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using osu.Framework.Configuration; diff --git a/osu.Game/GameModes/FieldTest.cs b/osu.Game/GameModes/FieldTest.cs index 908354af96..7bf71068d6 100644 --- a/osu.Game/GameModes/FieldTest.cs +++ b/osu.Game/GameModes/FieldTest.cs @@ -1,5 +1,5 @@ //Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT License - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using OpenTK; using OpenTK.Graphics; diff --git a/osu.Game/GameModes/FontTest.cs b/osu.Game/GameModes/FontTest.cs index 935cef3c82..2617b3ee19 100644 --- a/osu.Game/GameModes/FontTest.cs +++ b/osu.Game/GameModes/FontTest.cs @@ -1,5 +1,5 @@ //Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT License - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System; using System.Collections.Generic; diff --git a/osu.Game/GameModes/Menu/ButtonSystem.cs b/osu.Game/GameModes/Menu/ButtonSystem.cs index 1bc0b06c8d..626072796c 100644 --- a/osu.Game/GameModes/Menu/ButtonSystem.cs +++ b/osu.Game/GameModes/Menu/ButtonSystem.cs @@ -1,5 +1,5 @@ //Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT License - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System; using System.Collections.Generic; diff --git a/osu.Game/GameModes/Menu/MainMenu.cs b/osu.Game/GameModes/Menu/MainMenu.cs index 063b42a5f2..750726ec1e 100644 --- a/osu.Game/GameModes/Menu/MainMenu.cs +++ b/osu.Game/GameModes/Menu/MainMenu.cs @@ -1,5 +1,5 @@ //Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT License - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using osu.Framework.Audio.Sample; using osu.Framework.Audio.Track; diff --git a/osu.Game/Graphics/Containers/OsuComponent.cs b/osu.Game/Graphics/Containers/OsuComponent.cs index b6a61f1316..40d49c1332 100644 --- a/osu.Game/Graphics/Containers/OsuComponent.cs +++ b/osu.Game/Graphics/Containers/OsuComponent.cs @@ -1,5 +1,5 @@ //Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT License - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System; using System.Collections.Generic; diff --git a/osu.Game/Graphics/Containers/OsuGameMode.cs b/osu.Game/Graphics/Containers/OsuGameMode.cs index c9987c79c4..9ac6845bb4 100644 --- a/osu.Game/Graphics/Containers/OsuGameMode.cs +++ b/osu.Game/Graphics/Containers/OsuGameMode.cs @@ -1,5 +1,5 @@ //Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT License - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System; using System.Collections.Generic; diff --git a/osu.Game/Graphics/Containers/OsuLargeComponent.cs b/osu.Game/Graphics/Containers/OsuLargeComponent.cs index 1563f19a13..761ac557e2 100644 --- a/osu.Game/Graphics/Containers/OsuLargeComponent.cs +++ b/osu.Game/Graphics/Containers/OsuLargeComponent.cs @@ -1,5 +1,5 @@ //Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT License - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System; using System.Collections.Generic; diff --git a/osu.Game/Graphics/Cursor/CursorContainer.cs b/osu.Game/Graphics/Cursor/CursorContainer.cs index 470d05d920..df2a05ba3d 100644 --- a/osu.Game/Graphics/Cursor/CursorContainer.cs +++ b/osu.Game/Graphics/Cursor/CursorContainer.cs @@ -1,5 +1,5 @@ //Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT License - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; diff --git a/osu.Game/Graphics/Processing/RatioAdjust.cs b/osu.Game/Graphics/Processing/RatioAdjust.cs index 3a0e6d2cfe..6aeb9dbb9d 100644 --- a/osu.Game/Graphics/Processing/RatioAdjust.cs +++ b/osu.Game/Graphics/Processing/RatioAdjust.cs @@ -1,5 +1,5 @@ //Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT License - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; diff --git a/osu.Game/Graphics/TextAwesome.cs b/osu.Game/Graphics/TextAwesome.cs index 48d74e62af..faf7cb2866 100644 --- a/osu.Game/Graphics/TextAwesome.cs +++ b/osu.Game/Graphics/TextAwesome.cs @@ -1,5 +1,5 @@ //Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT License - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using osu.Framework.Graphics.Sprites; using OpenTK; diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs index c83744b124..0bccbd02c3 100644 --- a/osu.Game/OsuGame.cs +++ b/osu.Game/OsuGame.cs @@ -1,5 +1,5 @@ //Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT License - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System.Drawing; using osu.Framework.Framework; diff --git a/osu.Game/Properties/AssemblyInfo.cs b/osu.Game/Properties/AssemblyInfo.cs index e5f402eaf9..fbf2e28498 100644 --- a/osu.Game/Properties/AssemblyInfo.cs +++ b/osu.Game/Properties/AssemblyInfo.cs @@ -1,5 +1,5 @@ //Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT License - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System.Reflection; using System.Runtime.CompilerServices; diff --git a/osu.Game/packages.config b/osu.Game/packages.config index 378dbb27e9..81483329dd 100644 --- a/osu.Game/packages.config +++ b/osu.Game/packages.config @@ -1,7 +1,7 @@  diff --git a/osu.licenseheader b/osu.licenseheader index 994f269364..69054d22af 100644 --- a/osu.licenseheader +++ b/osu.licenseheader @@ -1,9 +1,9 @@ extensions: .cs //Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT License - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE extensions: .xml .config .xsd