From 46d3fbfa51f50846a2a1ff8f723b41e2dfc89ca6 Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.de>
Date: Thu, 4 Mar 2004 17:46:23 +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).

---
 glxint.h    | 2 +-
 glxmd.h     | 2 +-
 glxproto.h  | 2 +-
 glxtokens.h | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/glxint.h b/glxint.h
index 4b53e9f..74e9efe 100644
--- a/glxint.h
+++ b/glxint.h
@@ -1,7 +1,7 @@
 #ifndef __GLX_glxint_h__
 #define __GLX_glxint_h__
 
-/* $XFree86: xc/include/GL/glxint.h,v 1.4 2001/08/01 00:44:34 tsi Exp $ */
+/* $XFree86: xc/include/GL/glxint.h,v 1.3 2000/11/18 19:37:04 tsi Exp $ */
 /*
 ** The contents of this file are subject to the GLX Public License Version 1.0
 ** (the "License"). You may not use this file except in compliance with the
diff --git a/glxmd.h b/glxmd.h
index 3c4dc65..ddb03c3 100644
--- a/glxmd.h
+++ b/glxmd.h
@@ -1,7 +1,7 @@
 #ifndef _GLX_glxmd_h_
 #define _GLX_glxmd_h_
 
-/* $XFree86: xc/include/GL/glxmd.h,v 1.3 2001/03/21 15:51:38 dawes Exp $ */
+/* $XFree86: xc/include/GL/glxmd.h,v 1.2 1999/06/14 07:23:28 dawes Exp $ */
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
diff --git a/glxproto.h b/glxproto.h
index 120b49b..998d557 100644
--- a/glxproto.h
+++ b/glxproto.h
@@ -1,7 +1,7 @@
 #ifndef _GLX_glxproto_h_
 #define _GLX_glxproto_h_
 
-/* $XFree86: xc/include/GL/glxproto.h,v 1.7 2004/01/28 18:11:37 alanh Exp $ */
+/* $XFree86: xc/include/GL/glxproto.h,v 1.6 2003/09/28 20:14:58 alanh Exp $ */
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
diff --git a/glxtokens.h b/glxtokens.h
index af21475..e30c579 100644
--- a/glxtokens.h
+++ b/glxtokens.h
@@ -1,7 +1,7 @@
 #ifndef __GLX_glxtokens_h__
 #define __GLX_glxtokens_h__
 
-/* $XFree86: xc/include/GL/glxtokens.h,v 1.6 2002/02/22 21:32:50 dawes Exp $ */
+/* $XFree86: xc/include/GL/glxtokens.h,v 1.5 2001/03/21 15:51:38 dawes Exp $ */
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
-- 
cgit v1.2.3