Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make sure all licence texts are really the same

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35168 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2005-08-10 18:46:42 +00:00
parent a24d7726e6
commit b8c8d204b7
3 changed files with 101 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
docs/latex/wx/manual2e.tex
View File

@@ -100,7 +100,7 @@ Portions (c) 1996 Artificial Intelligence Applications Institute\\
Please also see the wxWindows license files (preamble.txt, lgpl.txt, gpl.txt, licence.txt,
licendoc.txt) for conditions of software and documentation use.
\section*{wxWidgets Library License, Version 3}
\section*{wxWindows Library License, Version 3.1}\label{wxlicense}
% !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
%
@@ -109,7 +109,7 @@ licendoc.txt) for conditions of software and documentation use.
%
% !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
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
of this licence document, but changing it is not allowed.
@@ -139,12 +139,12 @@ 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
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 the user's own terms, binary object code versions of works based
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