From e9bf776711b22ce336cd462adf534ad3e2d61eec Mon Sep 17 00:00:00 2001
From: Keith Whitwell <keith@tungstengraphics.com>
Date: Mon, 8 Jan 2001 04:06:20 +0000
Subject: Modify X11 driver and fake glx to store a GLcontext (ie a 'struct
 __GLcontextRec *') instead of an 'XMesaContext'.

This is to fix conflicts in XFree86 where both the indirect XMesaContext
and the GLcontext were calling themselves __GLcontextRec's.
---
 src/mesa/drivers/x11/xfonts.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/mesa/drivers/x11/xfonts.c')

diff --git a/src/mesa/drivers/x11/xfonts.c b/src/mesa/drivers/x11/xfonts.c
index 4243f3ff8d..6e73504ba5 100644
--- a/src/mesa/drivers/x11/xfonts.c
+++ b/src/mesa/drivers/x11/xfonts.c
@@ -1,8 +1,8 @@
-/* $Id: xfonts.c,v 1.10 2000/11/10 17:23:03 brianp Exp $ */
+/* $Id: xfonts.c,v 1.11 2001/01/08 04:06:20 keithw Exp $ */
 
 /*
  * Mesa 3-D graphics library
- * Version:  3.4
+ * Version:  3.5
  *
  * Copyright (C) 1999-2000  Brian Paul   All Rights Reserved.
  *
-- 
cgit v1.2.3