From c4ff56f0cec660af6958f65300d518fdbc2fd5b2 Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.de>
Date: Thu, 4 Mar 2004 17:46:24 +0000
Subject: 18. Merged in XFree86 code up to 4.4.0 including changes to files
 that had     a changed license. There was only one change which happened to
 be from     me (Egbert Eich).

---
 Xinerama.h       | 1 +
 panoramiXext.h   | 2 +-
 panoramiXproto.h | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Xinerama.h b/Xinerama.h
index daf7be2..6a577db 100644
--- a/Xinerama.h
+++ b/Xinerama.h
@@ -1,4 +1,5 @@
 /* $XdotOrg: xc/include/extensions/Xinerama.h,v 1.1.4.1 2003/12/18 22:59:34 kaleb Exp $ */
+/* $XFree86: xc/include/extensions/Xinerama.h,v 3.3 2002/09/16 18:05:19 eich Exp $ */
 /*
 
 Copyright 2003  The Open Group
diff --git a/panoramiXext.h b/panoramiXext.h
index 3342e38..ad2f7e4 100644
--- a/panoramiXext.h
+++ b/panoramiXext.h
@@ -26,7 +26,7 @@ Equipment Corporation.
 /*  
  *	PanoramiX definitions
  */
-/* $XFree86: xc/include/extensions/panoramiXext.h,v 3.7 2003/11/17 22:20:03 dawes Exp $ */
+/* $XFree86: xc/include/extensions/panoramiXext.h,v 3.6 2001/01/17 17:53:22 dawes Exp $ */
 
 /* THIS IS NOT AN X PROJECT TEAM SPECIFICATION */
 
diff --git a/panoramiXproto.h b/panoramiXproto.h
index fe3826e..6b27c56 100644
--- a/panoramiXproto.h
+++ b/panoramiXproto.h
@@ -23,7 +23,7 @@ shall not be used in advertising or otherwise to promote the sale, use or other
 dealings in this Software without prior written authorization from Digital
 Equipment Corporation.
 ******************************************************************/
-/* $XFree86: xc/include/extensions/panoramiXproto.h,v 3.6 2001/01/17 17:53:22 dawes Exp $ */
+/* $XFree86: xc/include/extensions/panoramiXproto.h,v 3.5 2000/03/01 01:04:21 dawes Exp $ */
 
 /* THIS IS NOT AN X PROJECT TEAM SPECIFICATION */
 
-- 
cgit v1.2.3