diff options
| author | Egbert Eich <eich@suse.de> | 2004-04-23 18:54:16 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-04-23 18:54:16 +0000 |
| commit | 0664db19bf37f9dd69cca6adff4e238e310c3092 (patch) | |
| tree | d2cc9d3132d40796018a853df38877fa5b027f18 /GL/include | |
| parent | 9d24a5fa91bf165bbd2048a844edeb59b5e34aad (diff) | |
Merging XORG-CURRENT into trunk
Diffstat (limited to 'GL/include')
| -rw-r--r-- | GL/include/GL/glx_ansic.h | 2 | ||||
| -rw-r--r-- | GL/include/GL/xf86glx.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/GL/include/GL/glx_ansic.h b/GL/include/GL/glx_ansic.h index c50288055..c10cf4b64 100644 --- a/GL/include/GL/glx_ansic.h +++ b/GL/include/GL/glx_ansic.h @@ -1,7 +1,7 @@ #ifndef _glx_ansic_h_ #define _glx_ansic_h_ -/* $XFree86: xc/programs/Xserver/GL/include/GL/glx_ansic.h,v 1.7 2002/04/04 14:05:36 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/include/GL/glx_ansic.h,v 1.5 2001/03/21 20:49:08 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/GL/include/GL/xf86glx.h b/GL/include/GL/xf86glx.h index 7a467b9b5..08e2a9f6c 100644 --- a/GL/include/GL/xf86glx.h +++ b/GL/include/GL/xf86glx.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/include/GL/xf86glx.h,v 1.4 2000/02/23 04:46:54 martin Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/include/GL/xf86glx.h,v 1.3 1999/06/14 07:31:41 dawes Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. |