From 095814548609c4522dfe8ed8b9c134373807d794 Mon Sep 17 00:00:00 2001 From: Gervase Markham Date: Tue, 2 Oct 2012 12:52:06 +0100 Subject: [PATCH] Bug 759095 - remove stray references to tri-license. --- browser/themes/LICENSE | 4 ++-- layout/reftests/generated-content/quotes-001.xml | 10 +++++++--- testing/extensions/community/README | 11 ++++++----- toolkit/themes/LICENSE | 4 ++-- 4 files changed, 17 insertions(+), 12 deletions(-) diff --git a/browser/themes/LICENSE b/browser/themes/LICENSE index 27438f32c72..39d4f8fdf51 100644 --- 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. diff --git a/layout/reftests/generated-content/quotes-001.xml b/layout/reftests/generated-content/quotes-001.xml index 557e1c3ac2c..4085c44acb4 100644 --- a/layout/reftests/generated-content/quotes-001.xml +++ b/layout/reftests/generated-content/quotes-001.xml @@ -1,9 +1,13 @@ + + diff --git a/testing/extensions/community/README b/testing/extensions/community/README index 19ec137979d..61d934eba63 100644 --- a/testing/extensions/community/README +++ b/testing/extensions/community/README @@ -4,8 +4,9 @@ Maintained by: Zach Lipton 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. diff --git a/toolkit/themes/LICENSE b/toolkit/themes/LICENSE index 27438f32c72..39d4f8fdf51 100644 --- 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.