Update the directory icon in wxGenericDirCtrl::ExpandDir().

[wxWidgets.git] / src / regex / COPYRIGHT

diff --git a/src/regex/COPYRIGHT b/src/regex/COPYRIGHT
index 1897d59acd5c5983e54d3d5c26295eb1367277c7..22cbb2583ff3ca9933e49c3043ec89cb4cbf916f 100644 (file)
--- a/src/regex/COPYRIGHT
+++ b/src/regex/COPYRIGHT
@@ -31,9 +31,9 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 **********************************************************************
 
-PostgreSQL adopted the code out of Tcl 8.4.1.  Portions of regc_locale.c
-and re_syntax.n were developed by Tcl developers other than Henry; these
-files bear the Tcl copyright and license notice:
+wxWindows adopted the code out of Tcl 8.4.5.  Portions of regc_locale.c
+and re_syntax.n were developed by Tcl developers other than Henry Spencer;
+these files bear the Tcl copyright and license notice:
 
 **********************************************************************
 
@@ -80,31 +80,7 @@ terms specified in this license.
 
 **********************************************************************
 
-Subsequent modifications to the code by the PostgreSQL project follow
-the same license terms as the rest of PostgreSQL.
-(License follows)
-****************************************************************************
-PostgreSQL Database Management System
-(formerly known as Postgres, then as Postgres95)
-
-Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
-
-Portions Copyright (c) 1994, The Regents of the University of California
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose, without fee, and without a written agreement
-is hereby granted, provided that the above copyright notice and this
-paragraph and the following two paragraphs appear in all copies.
+The wxWindows licence applies to further modifications to regcustom.h
+and regc_locale.c.
 
-IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING
-LOST PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS
-DOCUMENTATION, EVEN IF THE UNIVERSITY OF CALIFORNIA HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-
-THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
-ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATIONS TO
-PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 ****************************************************************************