aboutsummaryrefslogtreecommitdiff
path: root/X11/Sunkeysym.h
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-05-16 18:14:59 +0000
committermarha <marha@users.sourceforge.net>2010-05-16 18:14:59 +0000
commit98d261187099eea8112d0953778882ba3d7c9c00 (patch)
tree3675aded6d87fe25d659854141dae8dc6fd0fd24 /X11/Sunkeysym.h
parent0cc46df268cf3a3a3a2a25afe3a2415a4ec4193f (diff)
downloadvcxsrv-98d261187099eea8112d0953778882ba3d7c9c00.tar.gz
vcxsrv-98d261187099eea8112d0953778882ba3d7c9c00.tar.bz2
vcxsrv-98d261187099eea8112d0953778882ba3d7c9c00.zip
Updated to xproto-7.0.17
Diffstat (limited to 'X11/Sunkeysym.h')
-rw-r--r--X11/Sunkeysym.h48
1 files changed, 22 insertions, 26 deletions
diff --git a/X11/Sunkeysym.h b/X11/Sunkeysym.h
index be1b21d36..87e7f119b 100644
--- a/X11/Sunkeysym.h
+++ b/X11/Sunkeysym.h
@@ -1,3 +1,25 @@
+/*
+ * Copyright © 1991 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.
+ */
/************************************************************
Copyright 1991, 1998 The Open Group
@@ -22,32 +44,6 @@ Except as contained in this notice, the name of The Open Group shall not be
used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
-
-Copyright 1991 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 of 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 TORTUOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
-THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
***********************************************************/
/*