Changeset 1579

Timestamp:

06/19/08 15:22:41 (3 months ago)

Author:

alo

Message:

Files:

cherokee/trunk/ChangeLog

r1578	r1579
	1	2008-06-19 Alvaro Lopez Ortega <alvaro@alobbs.com>
	2
	3	* themes/firefox3/theme.css: Tries to clarify how this file is
	4	re-distributed. It was originally distributed under MPL1.1 /
	5	GPL2.0 / LGPL 2.1 licenses. We have chosen to re-distribute it
	6	under any of the two GPL licenses because MPL 1.1 conflicts with
	7	the GPL 2.0 license under which Cherokee is distributed.
	8
1	9	2008-06-18 Alvaro Lopez Ortega <alvaro@alobbs.com>
2	10

r1316	r1579
	1	/* LICENSING NOTICE (Cherokee)
	2	* We have chosen to re-distribute this file under the GPL 2.0/LGPL
	3	* 2.1 licenses rather than the MPL 1.1. It would conflict with the
	4	* GPL 2.0 license under which Cherokee is distributed otherwise.
	5	*/
	6
1	7	/* *** BEGIN LICENSE BLOCK ***
2	8	* Version: MPL 1.1/GPL 2.0/LGPL 2.1
3	9	*
4		* The contents of this file are subject to the Mozilla Public License Version
5		* 1.1 (the "License"); you may not use this file except in compliance with
6		* the License. You may obtain a copy of the License at
7		* http://www.mozilla.org/MPL/
8		*
9		* Software distributed under the License is distributed on an "AS IS" basis,
10		* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
11		* for the specific language governing rights and limitations under the
12		* License.
	10	* We have chosen to re-distribute this file under the GPL 2.0/LGPL
	11	* 2.1 licenses rather than the MPL 1.1. It would conflict with the
	12	* GPL 2.0 license under which Cherokee is distributed otherwise.
	13	*
	14	* [[MPL 1.1 License removed]]
13	15	*
14	16	* The Original Code is mozilla.org code.