diff options
| author | Eric Anholt <anholt@freebsd.org> | 2004-06-16 09:47:09 +0000 |
|---|---|---|
| committer | Eric Anholt <anholt@freebsd.org> | 2004-06-16 09:47:09 +0000 |
| commit | 290d3f948d650f64ef70fdcce62faf4b9c19af27 (patch) | |
| tree | ead2e279fc80b09e9b150ac816654eaa166207c9 | |
| parent | 88f719bedec749a400b3e2d883027ced0f6a3f5e (diff) | |
| download | xorg-proto-glproto-290d3f948d650f64ef70fdcce62faf4b9c19af27.tar.gz | |
Merge DRI-trunk-20040613 changes to include/GL
| -rw-r--r-- | glxproto.h | 2 | ||||
| -rw-r--r-- | glxtokens.h | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -1,7 +1,7 @@ #ifndef _GLX_glxproto_h_ #define _GLX_glxproto_h_ -/* $XFree86: xc/include/GL/glxproto.h,v 1.5 2001/08/01 00:44:34 tsi 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 0005b43..fbc1430 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 |