Unified copyright regions.

2018-11-08 10:20:42 +01:00
parent b1a44086a0
commit 7323db1492
15 changed files with 90 additions and 73 deletions
--- a/OpenRA.Mods.Common/FileFormats/Blast.cs
+++ b/OpenRA.Mods.Common/FileFormats/Blast.cs
@@ -6,7 +6,10 @@
 * as published by the Free Software Foundation, either version 3 of
 * the License, or (at your option) any later version. For more
 * information, see COPYING.
- *
+ */
+#endregion
+#region Additional Copyright & License Information
+/*
 * This file is based on the blast routines (version 1.1 by Mark Adler)
 * included in zlib/contrib
 */
--- a/OpenRA.Mods.Common/FileFormats/LZOCompression.cs
+++ b/OpenRA.Mods.Common/FileFormats/LZOCompression.cs
@@ -1,62 +1,68 @@
-#region Copyright notice
-/* C# port of the crude minilzo source version 2.06 by Frank Razenberg
-
-  Beware, you should never want to see C# code like this. You were warned.
-  I simply ran the MSVC preprocessor on the original source, changed the datatypes
-  to their C# counterpart and fixed changed some control flow stuff to amend for
-  the different goto semantics between C and C#.
-
-  Original copyright notice is included below.
+#region Copyright & License Information
+/*
+ * Copyright 2007-2018 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
+ */
+#endregion
+#region Additional Copyright & License Information
+/*
+ * C# port of the crude minilzo source version 2.06 by Frank Razenberg
+ * The full LZO package can be found at http://www.oberhumer.com/opensource/lzo/
+ *
+ * Beware, you should never want to see C# code like this. You were warned.
+ * I simply ran the MSVC preprocessor on the original source, changed the datatypes
+ * to their C# counterpart and fixed changed some control flow stuff to amend for
+ * the different goto semantics between C and C#.
+ *
+ * Original copyright notice is included below.
 */

-/* minilzo.c -- mini subset of the LZO real-time data compression library
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
-
-   The LZO library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
 /*
- * NOTE:
- *   the full LZO package can be found at
- *   http://www.oberhumer.com/opensource/lzo/
+ * minilzo.c -- mini subset of the LZO real-time data compression library
+ *
+ * This file is part of the LZO real-time data compression library.
+ *
+ * Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
+ * Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
+ * Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
+ * Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
+ * Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
+ * Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
+ * Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
+ * Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
+ * Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
+ * Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
+ * Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
+ * Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
+ * Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
+ * Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
+ * Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
+ * Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
+ * All Rights Reserved.
+ *
+ * The LZO library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * The LZO library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with the LZO library; see the file COPYING.
+ * If not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Markus F.X.J. Oberhumer
+ * <markus@oberhumer.com>
+ * http://www.oberhumer.com/opensource/lzo/
 */
-
 #endregion

 using System;
--- a/OpenRA.Mods.Common/Scripting/Properties/NukeProperties.cs
+++ b/OpenRA.Mods.Common/Scripting/Properties/NukeProperties.cs
@@ -5,7 +5,7 @@
 * available to you under the terms of the GNU General Public License
 * as published by the Free Software Foundation, either version 3 of
 * the License, or (at your option) any later version. For more
- * Information, see COPYING.
+ * information, see COPYING.
 */
 #endregion

--- a/OpenRA.Mods.Common/Traits/Infantry/TerrainModifiesDamage.cs
+++ b/OpenRA.Mods.Common/Traits/Infantry/TerrainModifiesDamage.cs
@@ -1,4 +1,4 @@
- #region Copyright & License Information
+#region Copyright & License Information
 /*
 * Copyright 2007-2018 The OpenRA Developers (see AUTHORS)
 * This file is part of OpenRA, which is free software. It is made
@@ -7,7 +7,7 @@
 * the License, or (at your option) any later version. For more
 * information, see COPYING.
 */
- #endregion
+#endregion

 using System.Collections.Generic;
 using OpenRA.Traits;
--- a/OpenRA.Mods.Common/Traits/ReloadAmmoPool.cs
+++ b/OpenRA.Mods.Common/Traits/ReloadAmmoPool.cs
@@ -3,8 +3,9 @@
 * Copyright 2007-2018 The OpenRA Developers (see AUTHORS)
 * This file is part of OpenRA, which is free software. It is made
 * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
 */
 #endregion

--- a/OpenRA.Mods.Common/Widgets/ColorPreviewManagerWidget.cs
+++ b/OpenRA.Mods.Common/Widgets/ColorPreviewManagerWidget.cs
@@ -7,7 +7,6 @@
 * the License, or (at your option) any later version. For more
 * information, see COPYING.
 */
-
 #endregion

 using OpenRA.Graphics;
--- a/OpenRA.Mods.Common/Widgets/Logic/CreditsLogic.cs
+++ b/OpenRA.Mods.Common/Widgets/Logic/CreditsLogic.cs
@@ -7,7 +7,6 @@
 * the License, or (at your option) any later version. For more
 * information, see COPYING.
 */
-
 #endregion

 using System;
--- a/OpenRA.Mods.Common/Widgets/Logic/DirectConnectLogic.cs
+++ b/OpenRA.Mods.Common/Widgets/Logic/DirectConnectLogic.cs
@@ -3,8 +3,9 @@
 * Copyright 2007-2018 The OpenRA Developers (see AUTHORS)
 * This file is part of OpenRA, which is free software. It is made
 * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
 */
 #endregion

--- a/OpenRA.Mods.Common/Widgets/Logic/Editor/MapEditorTabsLogic.cs
+++ b/OpenRA.Mods.Common/Widgets/Logic/Editor/MapEditorTabsLogic.cs
@@ -7,7 +7,6 @@
 * the License, or (at your option) any later version. For more
 * information, see COPYING.
 */
-
 #endregion

 using OpenRA.Graphics;
--- a/OpenRA.Mods.Common/Widgets/Logic/SettingsLogic.cs
+++ b/OpenRA.Mods.Common/Widgets/Logic/SettingsLogic.cs
@@ -7,7 +7,6 @@
 * the License, or (at your option) any later version. For more
 * information, see COPYING.
 */
-
 #endregion

 using System;