Skip to content

Commit

Permalink
Fixed License Header
Browse files Browse the repository at this point in the history
  • Loading branch information
killerrin committed Jan 17, 2015
1 parent a406bce commit 756bfbe
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 29 deletions.
2 changes: 1 addition & 1 deletion MonoGame.Framework/Circle.cs
@@ -1,4 +1,4 @@
// MIT License - Copyright (C) The Mono.Xna Team
// MonoGame - Copyright (C) The MonoGame Team
// This file is subject to the terms and conditions defined in
// file 'LICENSE.txt', which is part of this source code package.

Expand Down
30 changes: 3 additions & 27 deletions MonoGame.Framework/Content/ContentReaders/CircleReader.cs
@@ -1,30 +1,6 @@
#region License
/*
MIT License
Copyright © 2006 The Mono.Xna Team
All rights reserved.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
*/
#endregion License

// MonoGame - Copyright (C) The MonoGame Team
// This file is subject to the terms and conditions defined in
// file 'LICENSE.txt', which is part of this source code package.

using System;
using System.Collections.Generic;
Expand Down
6 changes: 5 additions & 1 deletion Test/Framework/CircleTest.cs
@@ -1,4 +1,8 @@
using Microsoft.Xna.Framework;
// MonoGame - Copyright (C) The MonoGame Team
// This file is subject to the terms and conditions defined in
// file 'LICENSE.txt', which is part of this source code package.

using Microsoft.Xna.Framework;
using NUnit.Framework;

namespace MonoGame.Tests.Framework
Expand Down

2 comments on commit 756bfbe

@mgbot
Copy link
Member

@mgbot mgbot commented on 756bfbe Jan 17, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TeamCity MonoGame :: Develop (Win) Build 3.3.0.1908 is now running

@mgbot
Copy link
Member

@mgbot mgbot commented on 756bfbe Jan 17, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TeamCity MonoGame :: Develop (Win) Build 3.3.0.1908 outcome was SUCCESS
Summary: Tests passed: 376, ignored: 6 Build time: 00:15:53

Please sign in to comment.