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

Small corrections to licence

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35051 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2005-08-02 17:36:23 +00:00
parent b5ab6d19d3
commit d98c97a36a
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -97,7 +97,7 @@ licendoc.txt) for conditions of software and documentation use.
Note that we use the old name wxWindows in the license, pending Note that we use the old name wxWindows in the license, pending
recognition of the new name by OSI. recognition of the new name by OSI.
\section*{wxWindows Library License, Version 3}\label{wxlicense} \section*{wxWindows Library License, Version 3.1}\label{wxlicense}
% !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! % !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
% %
@@ -106,7 +106,7 @@ recognition of the new name by OSI.
% %
% !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! % !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
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 licence document, but changing it is not allowed. of this licence document, but changing it is not allowed.
@@ -136,12 +136,12 @@ EXCEPTION NOTICE
1. As a special exception, the copyright holders of this library give 1. As a special exception, the copyright holders of this library give
permission for additional uses of the text contained in this release of permission for additional uses of the text contained in this release of
the library as licenced under the wxWindows Library Licence, applying the library as licenced under the wxWindows Library Licence, applying
either version 3 of the Licence, or (at your option) any later version of 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 of the the Licence as published by the copyright holders of version 3.1 of the
Licence document. Licence document.
2. The exception is that you may use, copy, link, modify and distribute 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. on the Library.
3. If you copy code from files distributed under the terms of the GNU 3. If you copy code from files distributed under the terms of the GNU

14
docs/licence.txt
View File

@@ -1,7 +1,7 @@
wxWindows Library Licence, Version 3 wxWindows Library Licence, Version 3.1
==================================== ======================================
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 licence document, but changing it is not allowed. of this licence document, but changing it is not allowed.
@@ -29,12 +29,12 @@
1. As a special exception, the copyright holders of this library give 1. As a special exception, the copyright holders of this library give
permission for additional uses of the text contained in this release of permission for additional uses of the text contained in this release of
the library as licenced under the wxWindows Library Licence, applying the library as licenced under the wxWindows Library Licence, applying
either version 3 of the Licence, or (at your option) any later version of 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 of the the Licence as published by the copyright holders of version
Licence document. 3.1 of the Licence document.
2. The exception is that you may use, copy, link, modify and distribute 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. on the Library.
3. If you copy code from files distributed under the terms of the GNU 3. If you copy code from files distributed under the terms of the GNU