X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/526954c5968baa29218c994ec48e476ae2bd4b9f..eb6b14dc71402c42e0474779bfcd6e878383071e:/docs/doxygen/mainpages/copyright.h diff --git a/docs/doxygen/mainpages/copyright.h b/docs/doxygen/mainpages/copyright.h index accd00a527..3fc7f3e529 100644 --- a/docs/doxygen/mainpages/copyright.h +++ b/docs/doxygen/mainpages/copyright.h @@ -2,7 +2,6 @@ // Name: copyright.h // Purpose: Copyright and license page of the Doxygen manual // Author: wxWidgets team -// RCS-ID: $Id$ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -10,21 +9,22 @@ @page page_copyright Copyrights and Licenses -Copyright (c) 1992-2008 Julian Smart, Robert Roebling, Vadim Zeitlin and other +Copyright (c) 1992-2012 Julian Smart, Robert Roebling, Vadim Zeitlin and other members of the wxWidgets team Portions (c) 1996 Artificial Intelligence Applications Institute Please also see the wxWindows licence files (preamble.txt, lgpl.txt, gpl.txt, licence.txt, 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 licence, pending recognition of the new name by OSI. @li @subpage page_copyright_wxlicense @li @subpage page_copyright_gnulicense +@li @subpage page_copyright_xserver -@page page_copyright_wxlicense wxWindows Library License +@page page_copyright_wxlicense wxWindows Library Licence @verbinclude "licence.txt" @@ -33,5 +33,8 @@ recognition of the new name by OSI. @verbinclude "lgpl.txt" -*/ +@page page_copyright_xserver The Open Group and DEC License + +@verbinclude "xserver.txt" +*/