Merge /u/jrubio/cdesktopenv/ branch implicit-int into master

[oweals/cde.git] / cde / copyright

diff --git a/cde/copyright b/cde/copyright
index 50ba9e6751257aa333761bdf2c640fa7f3da2ec8..3dd32313742f94bc0800a21c4f5d4ee895b9035e 100644 (file)
--- a/cde/copyright
+++ b/cde/copyright
@@ -1,36 +1,12 @@
-Below is a copy of the original copyright notice that accompanied the
-commercial releases of the Common Desktop Environment. For rights and
-information that covers the open-source releases, please see the file
-COPYING.
 
-If you wish to license the Common Desktop Environment under other terms
-please contact The Open Group.
------------------------------------------------------------------------------
 
 
-               Common Desktop Environment Version 2.1.30
+               Common Desktop Environment Version 2.3.0a (devel)
 
-    (c) Copyright 1993 - 1999 Hewlett-Packard Company
-    (c) Copyright 1993 - 1999 International Business Machines Corp.
-    (c) Copyright 1993 - 1999 Sun Microsystems, Inc.
-    (c) Copyright 1993 - 1999 Santa Cruz Organization, Inc.
-    (c) Copyright 1995 - 1999 Digital Equipment Corp.
-    (c) Copyright 1995 - 1996 Fujitsu Limited
-    (c) Copyright 1995 - 1996 Hitachi, Ltd.
+(c) Copyright 1993-2012 The Open Group
+(c) Copyright 2012-2018 CDE Project contributors, see CONTRIBUTORS for details
 
+Project Website: http://cdesktopenv.sourceforge.net/
 
-                     RESTRICTED RIGHTS LEGEND                              
-
-Use, duplication, or disclosure by the U.S. Government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause in DFARS 252.227-7013.  Rights
-for non-DOD U.S. Government Departments and Agencies are as set forth in
-FAR 52.227-19(c)(1,2).
-
-Hewlett-Packard Company, 3000 Hanover Street, Palo Alto, CA 94304 U.S.A.
-International Business Machines Corp., Route 100, Somers, NY 10589 U.S.A. 
-Sun Microsystems, Inc., 2550 Garcia Avenue, Mountain View, CA 94043 U.S.A.
-Santa Cruz Organization, Inc., 425 Encinal Street, Santa Cruz, CA 95061 U.S.A.
-Digital Equipment Corp., 111 Powdermill Road, Maynard, MA 01754, U.S.A.
-Fujitsu Limited, 1015, Kamikodanaka Nakahara-Ku, Kawasaki 211, Japan
-Hitachi, Ltd., 6, Kanda Surugadai 4-Chome, Chiyoda-ku, Tokyo 101, Japan
+CDE, the Common Desktop Environment, is released under the terms of
+the GNU LGPL, please see the file COPYING for more details.