From: Ted Jump <tjump@users.sourceforge.net>
Date: Fri, 17 Sep 1999 03:17:18 +0000 (+0000)
Subject: Patch error fixup
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d29b1c2ea6505aaca7d2ed8785c88a3468f68472;p=mesa.git

Patch error fixup
---

diff --git a/src/glu/mesa/glu.c b/src/glu/mesa/glu.c
index d649ca86e15..110e267aa8f 100644
--- a/src/glu/mesa/glu.c
+++ b/src/glu/mesa/glu.c
@@ -1,4 +1,4 @@
-/* $Id: glu.c,v 1.12 1999/09/17 03:07:28 tjump Exp $ */
+/* $Id: glu.c,v 1.13 1999/09/17 03:17:18 tjump Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -23,6 +23,9 @@
 
 /*
  * $Log: glu.c,v $
+ * Revision 1.13  1999/09/17 03:17:18  tjump
+ * Patch error fixup
+ *
  * Revision 1.12  1999/09/17 03:07:28  tjump
  * Win32 build req't updates
  *
@@ -376,11 +379,7 @@ const GLubyte* GLAPIENTRY gluGetString( GLenum name )
 /* for BeOS R4.5 */
 gluProcAddress GLAPIENTRY gluGetProcAddressEXT(const GLubyte *procName)
 #else
-<<<<<<< glu.c
 gluProcAddress GLAPIENTRY gluGetProcAddressEXT(const GLubyte *procName)
-=======
-void GLAPIENTRY (*gluGetProcAddressEXT(const GLubyte *procName))()
->>>>>>> 1.11
 #endif
 {
    struct proc {