From a2b9e9520297da0f7d13e4cc2e36acdf2bda105d Mon Sep 17 00:00:00 2001 From: Ryan Norton Date: Wed, 17 Dec 2003 19:00:02 +0000 Subject: [PATCH] Got rid wx-license git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24892 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/regex/COPYRIGHT | 56 +-------------------------------------------- 1 file changed, 1 insertion(+), 55 deletions(-) diff --git a/src/regex/COPYRIGHT b/src/regex/COPYRIGHT index 65aaadd6cf..485c57708b 100644 --- a/src/regex/COPYRIGHT +++ b/src/regex/COPYRIGHT @@ -108,59 +108,5 @@ AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. **************************************************************************** -And if that's not enough, changes made from wxWindows are put under the -wxWindows license: -**************************************************************************** - wxWindows Library Licence, Version 3 - ==================================== - - Copyright (C) 1998 Julian Smart, Robert Roebling [, ...] - - Everyone is permitted to copy and distribute verbatim copies - of this licence document, but changing it is not allowed. - - WXWINDOWS LIBRARY LICENCE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - This library is free software; you can redistribute it and/or modify it - under the terms of the GNU Library General Public Licence as published by - the Free Software Foundation; either version 2 of the Licence, or (at - your option) any later version. - - This library is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library - General Public Licence for more details. - - You should have received a copy of the GNU Library General Public Licence - along with this software, usually in a file named COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, - Boston, MA 02111-1307 USA. - - EXCEPTION NOTICE - - 1. As a special exception, the copyright holders of this library give - permission for additional uses of the text contained in this release of - the library as licenced under the wxWindows Library Licence, applying - either version 3 of the Licence, or (at your option) any later version of - the Licence as published by the copyright holders of version 3 of the - Licence document. - - 2. The exception is that you may use, copy, link, modify and distribute - under the user's own terms, binary object code versions of works based - on the Library. - - 3. If you copy code from files distributed under the terms of the GNU - General Public Licence or the GNU Library General Public Licence into a - copy of this library, as this licence permits, the exception does not - apply to the code that you add in this way. To avoid misleading anyone as - to the status of such modified files, you must delete this exception - notice from such code and/or adjust the licensing conditions notice - accordingly. - - 4. If you write modifications of your own for this library, it is your - choice whether to permit this exception to apply to your modifications. - If you do not wish that, you must delete the exception notice from such - code and/or adjust the licensing conditions notice accordingly. -**************************************************************************** +Changes made to the library in/for wxWindows are public domain. \ No newline at end of file -- 2.45.2