Bug 759095 - remove stray references to tri-license.
authorGervase Markham <gerv@gerv.net>
Tue, 02 Oct 2012 12:52:06 +0100
changeset 108889 9a3537526360eec7baef4ad760fc295448e5a3aa
parent 108888 7897fb9e2563162c391049f494fde1116861a608
child 108890 ea93afa3c7b7832ab5820d012c1f1035784cb3f2
push id23596
push useremorley@mozilla.com
push dateTue, 02 Oct 2012 15:53:55 +0000
treeherdermozilla-central@345a2a8ccb18 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs759095
milestone18.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 759095 - remove stray references to tri-license.
browser/themes/LICENSE
layout/reftests/generated-content/quotes-001.xml
testing/extensions/community/README
toolkit/themes/LICENSE
--- a/browser/themes/LICENSE
+++ b/browser/themes/LICENSE
@@ -1,2 +1,2 @@
-All files in this directory are assumed to be licensed under the 
-tri-license (MPL/GPL/LGPL) used throughout this codebase.
\ No newline at end of file
+All files in this directory are assumed to be licensed under the MPL 2 license
+which is used throughout this codebase.
--- a/layout/reftests/generated-content/quotes-001.xml
+++ b/layout/reftests/generated-content/quotes-001.xml
@@ -1,14 +1,18 @@
+<!-- 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/. -->
+   
 <!--
 
 Test originally from
-http://www.hixie.ch/tests/adhoc/css/quotes/001.xml
-and relicensed to MPL/LGPL/GPL tri-license per Hixie's permission on IRC,
-March 5, 2009.
+http://www.hixie.ch/tests/adhoc/css/quotes/001.xml ,
+relicensed to MPL/LGPL/GPL tri-license per Hixie's permission on IRC,
+March 5, 2009, and upgraded to MPL 2.
 
 -->
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
   <title>CSS and Quotes: Counting Right (Slightly Simpler Version)</title>
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch" />
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#quotes"/>
   <meta name="flags" content="" />
--- a/testing/extensions/community/README
+++ b/testing/extensions/community/README
@@ -1,11 +1,12 @@
 This is the Mozilla Community QA Extension Project.
 Maintained by: Zach Lipton <zach@zachlipton.com>
 
 For more details, please see the wiki at: 
     http://wiki.mozilla.org/Litmus:Extension
     
-License is MPL 1.1/GPL 2.0/LGPL 2.1 tri-license as described 
-in the various srouce files. MochiKit (c) 2005 Bob Ippolito, 
-Academic Free License. Chatzilla (used under MPL/GPL) is 
-modified slightly to run in a different chrome path to not 
-conflict with standard installations.
+License is MPL 2 as described in the various source files.
+
+MochiKit (c) 2005 Bob Ippolito, Academic Free License.
+
+Chatzilla (used under MPL 2) is modified slightly to run in a different
+chrome path to not conflict with standard installations.
--- a/toolkit/themes/LICENSE
+++ b/toolkit/themes/LICENSE
@@ -1,2 +1,2 @@
-All files in this directory are assumed to be licensed under the 
-tri-license (MPL/GPL/LGPL) used throughout this codebase.
\ No newline at end of file
+All files in this directory are assumed to be licensed under the MPL 2 license
+which is used throughout this codebase.