From 290d3f948d650f64ef70fdcce62faf4b9c19af27 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Wed, 16 Jun 2004 09:47:09 +0000 Subject: Merge DRI-trunk-20040613 changes to include/GL --- glxproto.h | 2 +- glxtokens.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/glxproto.h b/glxproto.h index 3fb6d64..3f700b3 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.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 -- cgit v1.2.3