From a7cd413a1ec992c2ba00aec16e70f9c16f9fac85 Mon Sep 17 00:00:00 2001 From: James Clark Date: Sat, 29 May 1999 02:19:21 +0000 Subject: [PATCH] Change license to MPL 1.1 --- expat/xmlparse/xmlparse.c | 14 ++++++++++++-- expat/xmltok/xmltok.c | 14 ++++++++++++-- expat/xmltok/xmltok.h | 14 ++++++++++++-- expat/xmltok/xmltok_impl.c | 14 ++++++++++++-- 4 files changed, 48 insertions(+), 8 deletions(-) diff --git a/expat/xmlparse/xmlparse.c b/expat/xmlparse/xmlparse.c index 5a2cc5ce..5bba8870 100755 --- a/expat/xmlparse/xmlparse.c +++ b/expat/xmlparse/xmlparse.c @@ -1,6 +1,6 @@ /* The contents of this file are subject to the Mozilla Public License -Version 1.0 (the "License"); you may not use this file except in +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/ @@ -12,10 +12,20 @@ under the License. The Original Code is expat. The Initial Developer of the Original Code is James Clark. -Portions created by James Clark are Copyright (C) 1998 +Portions created by James Clark are Copyright (C) 1998, 1999 James Clark. All Rights Reserved. Contributor(s): + +Alternatively, the contents of this file may be used under the terms +of the GNU General Public License (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. */ #include "xmldef.h" diff --git a/expat/xmltok/xmltok.c b/expat/xmltok/xmltok.c index bff53f87..8d058d41 100755 --- a/expat/xmltok/xmltok.c +++ b/expat/xmltok/xmltok.c @@ -1,6 +1,6 @@ /* The contents of this file are subject to the Mozilla Public License -Version 1.0 (the "License"); you may not use this file except in +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/ @@ -12,10 +12,20 @@ under the License. The Original Code is expat. The Initial Developer of the Original Code is James Clark. -Portions created by James Clark are Copyright (C) 1998 +Portions created by James Clark are Copyright (C) 1998, 1999 James Clark. All Rights Reserved. Contributor(s): + +Alternatively, the contents of this file may be used under the terms +of the GNU General Public License (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. */ #include "xmldef.h" diff --git a/expat/xmltok/xmltok.h b/expat/xmltok/xmltok.h index d87c8c67..06544d15 100755 --- a/expat/xmltok/xmltok.h +++ b/expat/xmltok/xmltok.h @@ -1,6 +1,6 @@ /* The contents of this file are subject to the Mozilla Public License -Version 1.0 (the "License"); you may not use this file except in +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/ @@ -12,10 +12,20 @@ under the License. The Original Code is expat. The Initial Developer of the Original Code is James Clark. -Portions created by James Clark are Copyright (C) 1998 +Portions created by James Clark are Copyright (C) 1998, 1999 James Clark. All Rights Reserved. Contributor(s): + +Alternatively, the contents of this file may be used under the terms +of the GNU General Public License (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. */ #ifndef XmlTok_INCLUDED diff --git a/expat/xmltok/xmltok_impl.c b/expat/xmltok/xmltok_impl.c index f3593812..f343b3fa 100755 --- a/expat/xmltok/xmltok_impl.c +++ b/expat/xmltok/xmltok_impl.c @@ -1,6 +1,6 @@ /* The contents of this file are subject to the Mozilla Public License -Version 1.0 (the "License"); you may not use this file except in +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/ @@ -12,10 +12,20 @@ under the License. The Original Code is expat. The Initial Developer of the Original Code is James Clark. -Portions created by James Clark are Copyright (C) 1998 +Portions created by James Clark are Copyright (C) 1998, 1999 James Clark. All Rights Reserved. Contributor(s): + +Alternatively, the contents of this file may be used under the terms +of the GNU General Public License (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. */ #ifndef IS_INVALID_CHAR