[xorg-commit-diffs] xc/include/extensions Xinerama.h, 1.1.4.5, 1.1.4.6 XIE.h, 1.1, NONE XIEproto.h, 1.1, NONE XIEprotost.h, 1.1, NONE

[Egbert Eich]

Committed by: eich

Update of /cvs/xorg/xc/include/extensions
In directory pdx:/home/eich/tstbuild/xc/include/extensions

Modified Files:
      Tag: XORG-CURRENT
	Xinerama.h 
Removed Files:
      Tag: XORG-CURRENT
	XIE.h XIEproto.h XIEprotost.h 
Log Message:
2004-04-15  Egbert Eich  <eich at freedesktop.org>
        Merged changes from RELEASE-1 branch
	


Index: Xinerama.h
===================================================================
RCS file: /cvs/xorg/xc/include/extensions/Xinerama.h,v
retrieving revision 1.1.4.5
retrieving revision 1.1.4.6
diff -u -d -r1.1.4.5 -r1.1.4.6
--- a/Xinerama.h	5 Mar 2004 13:38:52 -0000	1.1.4.5
+++ b/Xinerama.h	15 Apr 2004 10:14:52 -0000	1.1.4.6
@@ -1,3 +1,29 @@
+/* $XdotOrg$ */
+/*
+
+Copyright 2003  The Open Group
+
+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.
+
+The above copyright notice and this permission notice 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
+OPEN GROUP 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.
+
+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.
+
+*/
 /* $XFree86: xc/include/extensions/Xinerama.h,v 3.3 2002/09/16 18:05:19 eich Exp $ */
 
 #ifndef _Xinerama_h

--- XIE.h DELETED ---

--- XIEproto.h DELETED ---

--- XIEprotost.h DELETED ---