Changed the license to the Mozilla Public License 2.0 and update the licensing information.

3 files changed, 15 insertions, 96 deletions

diff --git a/Utilities/EmbeddedResources.cs b/Utilities/EmbeddedResources.cs
index cff974b..13c97e4 100644
--- a/Utilities/EmbeddedResources.cs
+++ b/Utilities/EmbeddedResources.cs
@@ -1,38 +1,11 @@
 /*

-  

-  Version: MPL 1.1/GPL 2.0/LGPL 2.1

-

-  The contents of this file are subject to the Mozilla Public License Version

-  1.1 (the "License"); you may not use this file except in compliance with

-  the License. You may obtain a copy of the License at

  

-  http://www.mozilla.org/MPL/

-

-  Software distributed under the License is distributed on an "AS IS" basis,

-  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License

-  for the specific language governing rights and limitations under the License.

-

-  The Original Code is the Open Hardware Monitor code.

-

-  The Initial Developer of the Original Code is 

-  Michael Möller <m.moeller@gmx.ch>.

-  Portions created by the Initial Developer are Copyright (C) 2009-2010

-  the Initial Developer. All Rights Reserved.

-

-  Contributor(s):

-

-  Alternatively, the contents of this file may be used under the terms of

-  either the GNU General Public License Version 2 or later (the "GPL"), or

-  the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),

-  in which case the provisions of the GPL or the LGPL are applicable instead

-  of those above. If you wish to allow use of your version of this file only

-  under the terms of either the GPL or the LGPL, and not to allow others to

-  use your version of this file under the terms of the MPL, indicate your

-  decision by deleting the provisions above and replace them with the notice

-  and other provisions required by the GPL or the LGPL. If you do not delete

-  the provisions above, a recipient may use your version of this file under

-  the terms of any one of the MPL, the GPL or the LGPL.

+  This Source Code Form is subject to the terms of the Mozilla Public

+  License, v. 2.0. If a copy of the MPL was not distributed with this

+  file, You can obtain one at http://mozilla.org/MPL/2.0/.

  

+  Copyright (C) 2009-2010 Michael Möller <mmoeller@openhardwaremonitor.org>

+	

 */

 

 using System;

diff --git a/Utilities/IconFactory.cs b/Utilities/IconFactory.cs
index d7a0e5e..5668200 100644
--- a/Utilities/IconFactory.cs
+++ b/Utilities/IconFactory.cs
@@ -1,38 +1,11 @@
 /*

-  

-  Version: MPL 1.1/GPL 2.0/LGPL 2.1

-

-  The contents of this file are subject to the Mozilla Public License Version

-  1.1 (the "License"); you may not use this file except in compliance with

-  the License. You may obtain a copy of the License at

  

-  http://www.mozilla.org/MPL/

-

-  Software distributed under the License is distributed on an "AS IS" basis,

-  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License

-  for the specific language governing rights and limitations under the License.

-

-  The Original Code is the Open Hardware Monitor code.

-

-  The Initial Developer of the Original Code is 

-  Michael Möller <m.moeller@gmx.ch>.

-  Portions created by the Initial Developer are Copyright (C) 2009-2010

-  the Initial Developer. All Rights Reserved.

-

-  Contributor(s):

-

-  Alternatively, the contents of this file may be used under the terms of

-  either the GNU General Public License Version 2 or later (the "GPL"), or

-  the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),

-  in which case the provisions of the GPL or the LGPL are applicable instead

-  of those above. If you wish to allow use of your version of this file only

-  under the terms of either the GPL or the LGPL, and not to allow others to

-  use your version of this file under the terms of the MPL, indicate your

-  decision by deleting the provisions above and replace them with the notice

-  and other provisions required by the GPL or the LGPL. If you do not delete

-  the provisions above, a recipient may use your version of this file under

-  the terms of any one of the MPL, the GPL or the LGPL.

+  This Source Code Form is subject to the terms of the Mozilla Public

+  License, v. 2.0. If a copy of the MPL was not distributed with this

+  file, You can obtain one at http://mozilla.org/MPL/2.0/.

  

+  Copyright (C) 2009-2010 Michael Möller <mmoeller@openhardwaremonitor.org>

+	

 */

 

 using System;

diff --git a/Utilities/PersistentSettings.cs b/Utilities/PersistentSettings.cs
index c1088dc..f68a1c5 100644
--- a/Utilities/PersistentSettings.cs
+++ b/Utilities/PersistentSettings.cs
@@ -1,38 +1,11 @@
 /*

-  

-  Version: MPL 1.1/GPL 2.0/LGPL 2.1

-

-  The contents of this file are subject to the Mozilla Public License Version

-  1.1 (the "License"); you may not use this file except in compliance with

-  the License. You may obtain a copy of the License at

  

-  http://www.mozilla.org/MPL/

-

-  Software distributed under the License is distributed on an "AS IS" basis,

-  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License

-  for the specific language governing rights and limitations under the License.

-

-  The Original Code is the Open Hardware Monitor code.

-

-  The Initial Developer of the Original Code is 

-  Michael Möller <m.moeller@gmx.ch>.

-  Portions created by the Initial Developer are Copyright (C) 2009-2010

-  the Initial Developer. All Rights Reserved.

-

-  Contributor(s):

-

-  Alternatively, the contents of this file may be used under the terms of

-  either the GNU General Public License Version 2 or later (the "GPL"), or

-  the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),

-  in which case the provisions of the GPL or the LGPL are applicable instead

-  of those above. If you wish to allow use of your version of this file only

-  under the terms of either the GPL or the LGPL, and not to allow others to

-  use your version of this file under the terms of the MPL, indicate your

-  decision by deleting the provisions above and replace them with the notice

-  and other provisions required by the GPL or the LGPL. If you do not delete

-  the provisions above, a recipient may use your version of this file under

-  the terms of any one of the MPL, the GPL or the LGPL.

+  This Source Code Form is subject to the terms of the Mozilla Public

+  License, v. 2.0. If a copy of the MPL was not distributed with this

+  file, You can obtain one at http://mozilla.org/MPL/2.0/.

  

+  Copyright (C) 2009-2010 Michael Möller <mmoeller@openhardwaremonitor.org>

+	

 */

 

 using System.Collections.Generic;