Merge DRI-trunk-20040613 changes to include/GL

This commit is contained in:
Eric Anholt 2004-06-16 09:47:09 +00:00
parent 88f719bede
commit 290d3f948d
2 changed files with 2 additions and 2 deletions

View file

@ -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

View file

@ -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