Changed the license to MPL/GPL.

1 files changed, 30 insertions, 14 deletions

diff --git a/gmakefile.win b/gmakefile.win
index f3a27f15..2671587f 100644
--- a/gmakefile.win
+++ b/gmakefile.win
@@ -1,21 +1,37 @@
 #!gmake
 # -*- Mode: Makefile -*-
-#
-# The contents of this file are subject to the Mozilla Public License
-# Version 1.1 (the "MPL"); you may not use this file except in
-# compliance with the MPL.  You may obtain a copy of the MPL at
-# http://www.mozilla.org/MPL/
 # 
-# Software distributed under the MPL is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the MPL
-# for the specific language governing rights and limitations under the
-# NPL.
+# 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 Netscape Portable Runtime (NSPR).
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are 
+# Copyright (C) 2001 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s):
+# 
+# Alternatively, the contents of this file may be used under the
+# terms of the GNU General Public License Version 2 or later (the
+# "GPL"), in which case the provisions of the GPL are applicable 
+# instead of those above.  If you wish to allow use of your 
+# version of this file only under the terms of the GPL and not to
+# allow others to use your version of this file under the MPL,
+# indicate your decision by deleting the provisions above and
+# replace them with the notice and other provisions required by
+# the GPL.  If you do not delete the provisions above, a recipient
+# may use your version of this file under either the MPL or the
+# GPL.
 # 
-# The Initial Developer of this code under the MPL is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 2001 Netscape Communications Corporation.  All Rights
-# Reserved.
-#
 
 
 ifndef MOZ_SRC_FLIPPED