diff options
| author | dawes <dawes> | 2001-05-01 21:39:08 +0000 |
|---|---|---|
| committer | dawes <dawes> | 2001-05-01 21:39:08 +0000 |
| commit | eaffbc49b7ffad575e12c348b31c083eee0dfd2b (patch) | |
| tree | 6f71460dddcd7ab96f89a1045b4d4e4fcd2ea7b3 /xc/include | |
| parent | c983988d91d546ee463ea56c1d0a8126c2c2bc7a (diff) | |
Initial merge for XFree86 4.0.99.3 import
Diffstat (limited to 'xc/include')
| -rw-r--r-- | xc/include/GL/glxproto.h | 2 | ||||
| -rw-r--r-- | xc/include/extensions/Imakefile | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/xc/include/GL/glxproto.h b/xc/include/GL/glxproto.h index a643d36bb..4c3397139 100644 --- a/xc/include/GL/glxproto.h +++ b/xc/include/GL/glxproto.h @@ -1,7 +1,7 @@ #ifndef _GLX_glxproto_h_ #define _GLX_glxproto_h_ -/* $XFree86: xc/include/GL/glxproto.h,v 1.3 2001/03/21 15:51:38 dawes Exp $ */ +/* $XFree86: xc/include/GL/glxproto.h,v 1.4 2001/04/10 16:07:49 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/xc/include/extensions/Imakefile b/xc/include/extensions/Imakefile index 5f698cb90..b99dc739b 100644 --- a/xc/include/extensions/Imakefile +++ b/xc/include/extensions/Imakefile @@ -3,7 +3,7 @@ XCOMM $Xorg: Imakefile,v 1.3 2000/08/18 04:05:44 coskrey Exp $ -XCOMM $XFree86: xc/include/extensions/Imakefile,v 3.39 2001/03/25 05:31:58 tsi Exp $ +XCOMM $XFree86: xc/include/extensions/Imakefile,v 3.40 2001/04/23 16:17:06 tsi Exp $ #if BuildScreenSaverExt SCREENSAVERHEADERS = saver.h saverproto.h scrnsaver.h @@ -37,7 +37,7 @@ FONTCACHEHEADERS = fontcache.h fontcacheP.h fontcachstr.h #if BuildXinerama XINERAMAHEADERS = panoramiXext.h panoramiXproto.h Xinerama.h #endif -#if BuildRender +#if BuildRender || BuildXftLibrary RENDERHEADERS = render.h renderproto.h #endif |