aboutsummaryrefslogtreecommitdiff
path: root/libXt/include/X11
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-03-16 09:44:59 +0000
committermarha <marha@users.sourceforge.net>2010-03-16 09:44:59 +0000
commit06615d6166af0efaf2893c6b7328b96c5a86b786 (patch)
treef6771f6813846d2c7aa771f5caef11ee5e398929 /libXt/include/X11
parented13095ef146649dce4a58c891544d7ff31915c7 (diff)
parentb958ead07bdfe03e2d697fd701bdfa82016ae5cb (diff)
downloadvcxsrv-06615d6166af0efaf2893c6b7328b96c5a86b786.tar.gz
vcxsrv-06615d6166af0efaf2893c6b7328b96c5a86b786.tar.bz2
vcxsrv-06615d6166af0efaf2893c6b7328b96c5a86b786.zip
svn merge ^/branches/released .
Diffstat (limited to 'libXt/include/X11')
-rw-r--r--libXt/include/X11/ThreadsI.h45
1 files changed, 21 insertions, 24 deletions
diff --git a/libXt/include/X11/ThreadsI.h b/libXt/include/X11/ThreadsI.h
index f07fe290f..b1c51e73f 100644
--- a/libXt/include/X11/ThreadsI.h
+++ b/libXt/include/X11/ThreadsI.h
@@ -1,30 +1,27 @@
/* $Xorg: ThreadsI.h,v 1.4 2001/02/09 02:03:59 xorgcvs Exp $ */
/************************************************************
-Copyright 1993 by Sun Microsystems, Inc. Mountain View, CA.
-
- All Rights Reserved
-
-Permission to use, copy, modify, and distribute this
-software and its documentation for any purpose and without
-fee is hereby granted, provided that the above copyright no-
-tice appear in all copies and that both that copyright no-
-tice and this permission notice appear in supporting docu-
-mentation, and that the name Sun not be used in advertising
-or publicity pertaining to distribution of the software
-without specific prior written permission. Sun makes no
-representations about the suitability of this software for
-any purpose. It is provided "as is" without any express or
-implied warranty.
-
-SUN DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FIT-
-NESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SUN BE LI-
-ABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
-PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
-THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+Copyright 1993 Sun Microsystems, Inc. All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice (including the next
+paragraph) shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
********************************************************/