From 5b5cf9cb8b3f540365e3da8e4a70f6a5040a1c6c Mon Sep 17 00:00:00 2001
From: Keith Whitwell <keith@tungstengraphics.com>
Date: Mon, 24 Nov 2003 15:19:27 +0000
Subject: [PATCH] Remove a lot of rcs tags, avoid merge conflicts

---
 src/glu/sgi/include/gluos.h                     | 1 -
 src/glu/sgi/libnurbs/interface/bezierEval.cc    | 2 --
 src/glu/sgi/libnurbs/interface/glcurveval.h     | 2 --
 src/glu/sgi/libnurbs/interface/glrenderer.cc    | 2 --
 src/glu/sgi/libnurbs/interface/glsurfeval.cc    | 2 --
 src/glu/sgi/libnurbs/interface/glsurfeval.h     | 2 --
 src/glu/sgi/libnurbs/internals/arc.cc           | 2 --
 src/glu/sgi/libnurbs/internals/arctess.cc       | 2 --
 src/glu/sgi/libnurbs/internals/basiccrveval.cc  | 2 --
 src/glu/sgi/libnurbs/internals/basicsurfeval.cc | 2 --
 src/glu/sgi/libnurbs/internals/coveandtiler.cc  | 2 --
 src/glu/sgi/libnurbs/internals/knotvector.cc    | 2 --
 src/glu/sgi/libnurbs/internals/mymath.h         | 2 --
 src/glu/sgi/libnurbs/internals/mysetjmp.h       | 2 --
 src/glu/sgi/libnurbs/internals/nurbsinterfac.cc | 2 --
 src/glu/sgi/libnurbs/internals/nurbstess.h      | 2 --
 src/glu/sgi/libnurbs/internals/subdivider.cc    | 2 --
 src/glu/sgi/libnurbs/nurbtess/directedLine.cc   | 2 --
 src/glu/sgi/libnurbs/nurbtess/polyDBG.cc        | 2 --
 src/glu/sgi/libtess/geom.h                      | 2 --
 src/glu/sgi/libtess/normal.c                    | 2 --
 src/glu/sgi/libtess/sweep.c                     | 2 --
 src/glu/sgi/libtess/tess.c                      | 2 --
 src/glu/sgi/libutil/mipmap.c                    | 2 --
 src/glu/sgi/libutil/quad.c                      | 2 --
 25 files changed, 49 deletions(-)

diff --git a/src/glu/sgi/include/gluos.h b/src/glu/sgi/include/gluos.h
index b91b9c5c06f..5743b2c2c2c 100644
--- a/src/glu/sgi/include/gluos.h
+++ b/src/glu/sgi/include/gluos.h
@@ -1,7 +1,6 @@
 /*
 ** gluos.h - operating system dependencies for GLU
 **
-** $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/include/gluos.h,v 1.6 2003/10/14 23:48:57 kendallb Exp $
 */
 #ifdef __VMS
 #ifdef __cplusplus
diff --git a/src/glu/sgi/libnurbs/interface/bezierEval.cc b/src/glu/sgi/libnurbs/interface/bezierEval.cc
index c72d64f787f..47baf131208 100644
--- a/src/glu/sgi/libnurbs/interface/bezierEval.cc
+++ b/src/glu/sgi/libnurbs/interface/bezierEval.cc
@@ -31,10 +31,8 @@
 ** published by SGI, but has not been independently verified as being
 ** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
-** $Date: 2003/10/14 23:48:57 $ $Revision: 1.3 $
 */
 /*
-** $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/interface/bezierEval.cc,v 1.3 2003/10/14 23:48:57 kendallb Exp $
 */
 
 #include <stdlib.h>
diff --git a/src/glu/sgi/libnurbs/interface/glcurveval.h b/src/glu/sgi/libnurbs/interface/glcurveval.h
index 417691933c1..4b44f6e847e 100644
--- a/src/glu/sgi/libnurbs/interface/glcurveval.h
+++ b/src/glu/sgi/libnurbs/interface/glcurveval.h
@@ -35,8 +35,6 @@
 /*
  * glcurveval.h
  *
- * $Date: 2003/10/15 21:11:13 $ $Revision: 1.6 $
- * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/interface/glcurveval.h,v 1.6 2003/10/15 21:11:13 brianp Exp $
  */
 
 #ifndef __gluglcurveval_h_
diff --git a/src/glu/sgi/libnurbs/interface/glrenderer.cc b/src/glu/sgi/libnurbs/interface/glrenderer.cc
index 7c9da9f45b1..17123fbc614 100644
--- a/src/glu/sgi/libnurbs/interface/glrenderer.cc
+++ b/src/glu/sgi/libnurbs/interface/glrenderer.cc
@@ -31,10 +31,8 @@
 ** published by SGI, but has not been independently verified as being
 ** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
-** $Date: 2003/10/14 23:48:57 $ $Revision: 1.2 $
 */
 /*
-** $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/interface/glrenderer.cc,v 1.2 2003/10/14 23:48:57 kendallb Exp $
 */
 
 #include "gluos.h"
diff --git a/src/glu/sgi/libnurbs/interface/glsurfeval.cc b/src/glu/sgi/libnurbs/interface/glsurfeval.cc
index 6f63aff44bc..0a4f18dcffd 100644
--- a/src/glu/sgi/libnurbs/interface/glsurfeval.cc
+++ b/src/glu/sgi/libnurbs/interface/glsurfeval.cc
@@ -35,8 +35,6 @@
 /*
  * glsurfeval.c++
  *
- * $Date: 2003/10/14 23:48:57 $ $Revision: 1.3 $
- * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/interface/glsurfeval.cc,v 1.3 2003/10/14 23:48:57 kendallb Exp $
  */
 
 /* Polynomial Evaluator Interface */
diff --git a/src/glu/sgi/libnurbs/interface/glsurfeval.h b/src/glu/sgi/libnurbs/interface/glsurfeval.h
index 87ceda332af..c34a58cb9b9 100644
--- a/src/glu/sgi/libnurbs/interface/glsurfeval.h
+++ b/src/glu/sgi/libnurbs/interface/glsurfeval.h
@@ -35,8 +35,6 @@
 /*
  * glsurfeval.h
  *
- * $Date: 2003/10/15 21:11:13 $ $Revision: 1.5 $
- * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/interface/glsurfeval.h,v 1.5 2003/10/15 21:11:13 brianp Exp $
  */
 
 #ifndef __gluglsurfeval_h_
diff --git a/src/glu/sgi/libnurbs/internals/arc.cc b/src/glu/sgi/libnurbs/internals/arc.cc
index 3b968303bdc..f795e00cd7e 100644
--- a/src/glu/sgi/libnurbs/internals/arc.cc
+++ b/src/glu/sgi/libnurbs/internals/arc.cc
@@ -35,8 +35,6 @@
 /*
  * arc.c++
  *
- * $Date: 2003/10/14 23:48:57 $ $Revision: 1.3 $
- * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/internals/arc.cc,v 1.3 2003/10/14 23:48:57 kendallb Exp $
  */
 
 #include <stdio.h>
diff --git a/src/glu/sgi/libnurbs/internals/arctess.cc b/src/glu/sgi/libnurbs/internals/arctess.cc
index 68783efb9f4..0ea84152ec4 100644
--- a/src/glu/sgi/libnurbs/internals/arctess.cc
+++ b/src/glu/sgi/libnurbs/internals/arctess.cc
@@ -35,8 +35,6 @@
 /*
  * arctessellator.c++
  *
- * $Date: 2003/10/15 21:11:13 $ $Revision: 1.3 $
- * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/internals/arctess.cc,v 1.3 2003/10/15 21:11:13 brianp Exp $
  */
 
 #include "glimports.h"
diff --git a/src/glu/sgi/libnurbs/internals/basiccrveval.cc b/src/glu/sgi/libnurbs/internals/basiccrveval.cc
index 24b33f0667c..c7e4282360b 100644
--- a/src/glu/sgi/libnurbs/internals/basiccrveval.cc
+++ b/src/glu/sgi/libnurbs/internals/basiccrveval.cc
@@ -35,8 +35,6 @@
 /*
  * basiccrveval.c++
  *
- * $Date: 2003/10/14 23:48:57 $ $Revision: 1.2 $
- * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/internals/basiccrveval.cc,v 1.2 2003/10/14 23:48:57 kendallb Exp $
  */
 
 #include "mystdio.h"
diff --git a/src/glu/sgi/libnurbs/internals/basicsurfeval.cc b/src/glu/sgi/libnurbs/internals/basicsurfeval.cc
index f84d3b6074f..ff212bf0b4b 100644
--- a/src/glu/sgi/libnurbs/internals/basicsurfeval.cc
+++ b/src/glu/sgi/libnurbs/internals/basicsurfeval.cc
@@ -35,8 +35,6 @@
 /*
  * basicsurfaceevaluator.c++
  *
- * $Date: 2003/10/14 23:48:57 $ $Revision: 1.2 $
- * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/internals/basicsurfeval.cc,v 1.2 2003/10/14 23:48:57 kendallb Exp $
  */
 
 #include "mystdio.h"
diff --git a/src/glu/sgi/libnurbs/internals/coveandtiler.cc b/src/glu/sgi/libnurbs/internals/coveandtiler.cc
index 9297d3fc21f..ca5bf36b363 100644
--- a/src/glu/sgi/libnurbs/internals/coveandtiler.cc
+++ b/src/glu/sgi/libnurbs/internals/coveandtiler.cc
@@ -35,8 +35,6 @@
 /*
  * coveandtiler.c++
  *
- * $Date: 2003/10/14 23:48:57 $ $Revision: 1.2 $
- * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/internals/coveandtiler.cc,v 1.2 2003/10/14 23:48:57 kendallb Exp $
  */
 
 #include "glimports.h"
diff --git a/src/glu/sgi/libnurbs/internals/knotvector.cc b/src/glu/sgi/libnurbs/internals/knotvector.cc
index 3e047456f5c..50556f622dd 100644
--- a/src/glu/sgi/libnurbs/internals/knotvector.cc
+++ b/src/glu/sgi/libnurbs/internals/knotvector.cc
@@ -35,8 +35,6 @@
 /*
  * knotvector.c++
  *
- * $Date: 2003/10/14 23:48:57 $ $Revision: 1.2 $
- * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/internals/knotvector.cc,v 1.2 2003/10/14 23:48:57 kendallb Exp $
  */
 
 #include "glimports.h"
diff --git a/src/glu/sgi/libnurbs/internals/mymath.h b/src/glu/sgi/libnurbs/internals/mymath.h
index ec823288430..73078251dda 100644
--- a/src/glu/sgi/libnurbs/internals/mymath.h
+++ b/src/glu/sgi/libnurbs/internals/mymath.h
@@ -35,8 +35,6 @@
 /*
  * mymath.h
  *
- * $Date: 2003/10/15 21:11:13 $ $Revision: 1.3 $
- * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/internals/mymath.h,v 1.3 2003/10/15 21:11:13 brianp Exp $
  */
 
 #ifndef __glumymath_h_
diff --git a/src/glu/sgi/libnurbs/internals/mysetjmp.h b/src/glu/sgi/libnurbs/internals/mysetjmp.h
index 6874089205f..bfb9cea98ba 100644
--- a/src/glu/sgi/libnurbs/internals/mysetjmp.h
+++ b/src/glu/sgi/libnurbs/internals/mysetjmp.h
@@ -35,8 +35,6 @@
 /*
  * mysetjmp.h
  *
- * $Date: 2003/10/15 21:11:13 $ $Revision: 1.3 $
- * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/internals/mysetjmp.h,v 1.3 2003/10/15 21:11:13 brianp Exp $
  */
 
 #ifndef __glumysetjmp_h_
diff --git a/src/glu/sgi/libnurbs/internals/nurbsinterfac.cc b/src/glu/sgi/libnurbs/internals/nurbsinterfac.cc
index 6d34951e160..1a68ca51d91 100644
--- a/src/glu/sgi/libnurbs/internals/nurbsinterfac.cc
+++ b/src/glu/sgi/libnurbs/internals/nurbsinterfac.cc
@@ -35,8 +35,6 @@
 /*
  * nurbsinterfac.c++
  *
- * $Date: 2003/10/15 21:11:13 $ $Revision: 1.2 $
- * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/internals/nurbsinterfac.cc,v 1.2 2003/10/15 21:11:13 brianp Exp $
  */
 
 #include "glimports.h"
diff --git a/src/glu/sgi/libnurbs/internals/nurbstess.h b/src/glu/sgi/libnurbs/internals/nurbstess.h
index 5e41a87e0d9..3577088a9c2 100644
--- a/src/glu/sgi/libnurbs/internals/nurbstess.h
+++ b/src/glu/sgi/libnurbs/internals/nurbstess.h
@@ -35,8 +35,6 @@
 /*
  * nurbstess.h
  *
- * $Date: 2003/10/15 21:11:13 $ $Revision: 1.3 $
- * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/internals/nurbstess.h,v 1.3 2003/10/15 21:11:13 brianp Exp $
  */
 
 #ifndef __glunurbstess_h_
diff --git a/src/glu/sgi/libnurbs/internals/subdivider.cc b/src/glu/sgi/libnurbs/internals/subdivider.cc
index 104a13a3f61..cc0b5147065 100644
--- a/src/glu/sgi/libnurbs/internals/subdivider.cc
+++ b/src/glu/sgi/libnurbs/internals/subdivider.cc
@@ -35,8 +35,6 @@
 /*
  * subdivider.cxx
  *
- * $Date: 2003/10/15 21:11:13 $ $Revision: 1.2 $
- * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/internals/subdivider.cc,v 1.2 2003/10/15 21:11:13 brianp Exp $
  */
 
 #include "glimports.h"
diff --git a/src/glu/sgi/libnurbs/nurbtess/directedLine.cc b/src/glu/sgi/libnurbs/nurbtess/directedLine.cc
index 18720458305..74450352d8c 100644
--- a/src/glu/sgi/libnurbs/nurbtess/directedLine.cc
+++ b/src/glu/sgi/libnurbs/nurbtess/directedLine.cc
@@ -31,10 +31,8 @@
 ** published by SGI, but has not been independently verified as being
 ** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
-** $Date: 2003/10/14 23:48:57 $ $Revision: 1.3 $
 */
 /*
-** $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/nurbtess/directedLine.cc,v 1.3 2003/10/14 23:48:57 kendallb Exp $
 */
 
 #include <stdlib.h>
diff --git a/src/glu/sgi/libnurbs/nurbtess/polyDBG.cc b/src/glu/sgi/libnurbs/nurbtess/polyDBG.cc
index 76f1076623c..ce38666dca4 100644
--- a/src/glu/sgi/libnurbs/nurbtess/polyDBG.cc
+++ b/src/glu/sgi/libnurbs/nurbtess/polyDBG.cc
@@ -31,10 +31,8 @@
 ** published by SGI, but has not been independently verified as being
 ** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
-** $Date: 2003/10/14 23:48:57 $ $Revision: 1.3 $
 */
 /*
-** $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/nurbtess/polyDBG.cc,v 1.3 2003/10/14 23:48:57 kendallb Exp $
 */
 
 #include <stdlib.h>
diff --git a/src/glu/sgi/libtess/geom.h b/src/glu/sgi/libtess/geom.h
index d2c649eee25..7e1e86528a5 100644
--- a/src/glu/sgi/libtess/geom.h
+++ b/src/glu/sgi/libtess/geom.h
@@ -35,8 +35,6 @@
 /*
 ** Author: Eric Veach, July 1994.
 **
-** $Date: 2003/10/14 23:48:57 $ $Revision: 1.2 $
-** $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libtess/geom.h,v 1.2 2003/10/14 23:48:57 kendallb Exp $
 */
 
 #ifndef __geom_h_
diff --git a/src/glu/sgi/libtess/normal.c b/src/glu/sgi/libtess/normal.c
index 7ffd39eb32d..f69544618cf 100644
--- a/src/glu/sgi/libtess/normal.c
+++ b/src/glu/sgi/libtess/normal.c
@@ -35,8 +35,6 @@
 /*
 ** Author: Eric Veach, July 1994.
 **
-** $Date: 2003/10/14 23:48:57 $ $Revision: 1.3 $
-** $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libtess/normal.c,v 1.3 2003/10/14 23:48:57 kendallb Exp $
 */
 
 #include "gluos.h"
diff --git a/src/glu/sgi/libtess/sweep.c b/src/glu/sgi/libtess/sweep.c
index e9fa8a77166..1cfd7788f78 100644
--- a/src/glu/sgi/libtess/sweep.c
+++ b/src/glu/sgi/libtess/sweep.c
@@ -35,8 +35,6 @@
 /*
 ** Author: Eric Veach, July 1994.
 **
-** $Date: 2003/10/14 23:48:57 $ $Revision: 1.6 $
-** $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libtess/sweep.c,v 1.6 2003/10/14 23:48:57 kendallb Exp $
 */
 
 #include "gluos.h"
diff --git a/src/glu/sgi/libtess/tess.c b/src/glu/sgi/libtess/tess.c
index 308b2f56b90..0489350a027 100644
--- a/src/glu/sgi/libtess/tess.c
+++ b/src/glu/sgi/libtess/tess.c
@@ -35,8 +35,6 @@
 /*
 ** Author: Eric Veach, July 1994.
 **
-** $Date: 2003/10/14 23:48:57 $ $Revision: 1.4 $
-** $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libtess/tess.c,v 1.4 2003/10/14 23:48:57 kendallb Exp $
 */
 
 #include "gluos.h"
diff --git a/src/glu/sgi/libutil/mipmap.c b/src/glu/sgi/libutil/mipmap.c
index 4ee54533582..0122a2aff69 100644
--- a/src/glu/sgi/libutil/mipmap.c
+++ b/src/glu/sgi/libutil/mipmap.c
@@ -31,8 +31,6 @@
 ** published by SGI, but has not been independently verified as being
 ** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
-** $Date: 2003/10/14 23:48:58 $ $Revision: 1.4 $
-** $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libutil/mipmap.c,v 1.4 2003/10/14 23:48:58 kendallb Exp $
 */
 
 #include "gluos.h"
diff --git a/src/glu/sgi/libutil/quad.c b/src/glu/sgi/libutil/quad.c
index 1939b0f7d05..8d9bcdda643 100644
--- a/src/glu/sgi/libutil/quad.c
+++ b/src/glu/sgi/libutil/quad.c
@@ -31,8 +31,6 @@
 ** published by SGI, but has not been independently verified as being
 ** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
-** $Date: 2003/10/14 23:48:58 $ $Revision: 1.4 $
-** $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libutil/quad.c,v 1.4 2003/10/14 23:48:58 kendallb Exp $
 */
 
 #include "gluos.h"
-- 
2.30.2