Fix wxHash{Set,Map} compilation with g++ 4.7 in C++11 mode.

[wxWidgets.git] / docs / licence.txt

diff --git a/docs/licence.txt b/docs/licence.txt
index c91deed0bc0604ed0b9c0e4d459f754810dff293..5bfc0e79548a50128911f59c88c149db2b75170f 100644 (file)
--- a/docs/licence.txt
+++ b/docs/licence.txt
@@ -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
   of this licence document, but changing it is not allowed.
@@ -21,20 +21,20 @@
 
   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.
+  write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301 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.
+  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