aboutsummaryrefslogtreecommitdiff
path: root/X11/extensions/compositeproto.h
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-12-06 13:05:31 +0000
committermarha <marha@users.sourceforge.net>2010-12-06 13:05:31 +0000
commit5764a57fb2ca3fc35377307d2e95bb0c6c8a37c5 (patch)
treefa2a82cd60b67304981789973e54b27e2bdd3833 /X11/extensions/compositeproto.h
parent4218fd3a8c41e4d9715cbcd6d855736028835fb8 (diff)
downloadvcxsrv-5764a57fb2ca3fc35377307d2e95bb0c6c8a37c5.tar.gz
vcxsrv-5764a57fb2ca3fc35377307d2e95bb0c6c8a37c5.tar.bz2
vcxsrv-5764a57fb2ca3fc35377307d2e95bb0c6c8a37c5.zip
Updated following packages:
bigreqsproto-1.1.1 compositeproto-0.4.2 damageproto-1.2.1 fixesproto-4.1.2 fontsproto-2.1.1 inputproto-2.0.1 randrproto-1.3.2 recordproto-1.14.1 scrnsaverproto-1.2.1 xcmiscproto-1.2.1 xproto-7.0.19
Diffstat (limited to 'X11/extensions/compositeproto.h')
-rw-r--r--X11/extensions/compositeproto.h39
1 files changed, 19 insertions, 20 deletions
diff --git a/X11/extensions/compositeproto.h b/X11/extensions/compositeproto.h
index 2e392e2eb..0417f2ce3 100644
--- a/X11/extensions/compositeproto.h
+++ b/X11/extensions/compositeproto.h
@@ -1,27 +1,26 @@
/*
- * $Id: compositeproto.h,v 1.4 2004/07/08 07:20:55 keithp Exp $
+ * Copyright (c) 2006, Oracle and/or its affiliates. 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:
*
- * Copyright © 2006 Sun Microsystems
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Sun Microsystems not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission. Sun Microsystems makes no
- * representations about the suitability of this software for any purpose. It
- * is provided "as is" without express or implied warranty.
- *
- * SUN MICROSYSTEMS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL SUN MICROSYSTEMS BE LIABLE 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.
+ * 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 © 2003 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its