summaryrefslogtreecommitdiffstats
path: root/base/third_party/nspr
diff options
context:
space:
mode:
authorevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-18 22:51:43 +0000
committerevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-18 22:51:43 +0000
commit2830cc7400a714e2ff62ff66216920a477bd64fd (patch)
tree93af476200b40ee9eedf2644a4b58d2fbd3d4e2b /base/third_party/nspr
parent96461bf2bcefa92c9af57b801b2ac069151beb4a (diff)
downloadchromium_src-2830cc7400a714e2ff62ff66216920a477bd64fd.zip
chromium_src-2830cc7400a714e2ff62ff66216920a477bd64fd.tar.gz
chromium_src-2830cc7400a714e2ff62ff66216920a477bd64fd.tar.bz2
Pass the license check script for base/third_party/{nss,nspr}.
Rather than trying to be clever about licenses, just include the proper licenses directly. Review URL: http://codereview.chromium.org/1143001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42020 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/third_party/nspr')
-rw-r--r--base/third_party/nspr/LICENSE35
-rw-r--r--base/third_party/nspr/README.chromium1
2 files changed, 35 insertions, 1 deletions
diff --git a/base/third_party/nspr/LICENSE b/base/third_party/nspr/LICENSE
new file mode 100644
index 0000000..eba7b77
--- /dev/null
+++ b/base/third_party/nspr/LICENSE
@@ -0,0 +1,35 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * 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 Netscape Portable Runtime (NSPR).
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998-2000
+ * 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.
+ *
+ * ***** END LICENSE BLOCK ***** */
diff --git a/base/third_party/nspr/README.chromium b/base/third_party/nspr/README.chromium
index ad65dbe..55a50fe 100644
--- a/base/third_party/nspr/README.chromium
+++ b/base/third_party/nspr/README.chromium
@@ -1,3 +1,2 @@
Name: Netscape Portable Runtime (NSPR)
URL: http://www.mozilla.org/projects/nspr/
-License: MPL tri-license