Better fix

[wxWidgets.git] / docs / wine / licence.txt

diff --git a/docs/wine/licence.txt b/docs/wine/licence.txt
index 101904ef852f8e72d7020f55e7a2842263e52cca..95f18d034c42716ee8bcbe43f0835f16f2a4c16b 100644 (file)
--- a/docs/wine/licence.txt
+++ b/docs/wine/licence.txt
@@ -1,56 +1,53 @@
+                wxWindows Library Licence, Version 3.1
+                ======================================

 
 

-
-wxWidgets Library License, Version 3
-====================================
-     
-  Copyright (C) 1998 Julian Smart, Robert Roebling et al. 
+  Copyright (c) 1998-2005 Julian Smart, Robert Roebling et al

 
   Everyone is permitted to copy and distribute verbatim copies
 
   Everyone is permitted to copy and distribute verbatim copies

-  of this license document, but changing it is not allowed. 
- 
-                          WXWINDOWS LIBRARY LICENSE 
-     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 License as published by 
-  the Free Software Foundation; either version 2 of the License, 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 MERCHAN- 
-  TABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library 
-  General Public License for more details. 
- 
-  You should have received a copy of the GNU Library General Public License 
-  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 licensed under the wxWidgets Library License, applying 
-  either version 3 of the License, or (at your option) any later version of 
-  the License as published by the copyright holders of version 3 of the 
-  License document. 
- 
-  2. The exception is that you may create binary object code versions of any 
-  works using this library or based on this library, and use, copy, modify, 
-  link and distribute such binary object code files unrestricted under terms 
-  of your choice. 
- 
-  3. If you copy code from files distributed under the terms of the GNU 
-  General Public License or the GNU Library General Public License into a 
-  copy of this library, as this license 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. 
+  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.1 of the Licence, or (at your option) any later version of
+  the Licence as published by the copyright holders of version
+  3.1 of the Licence document.
+
+  2. The exception is that you may use, copy, link, modify and distribute
+  under your 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.
+
+