Remove the Id tags to avoid conflicts when merging.

src/mesa/main/KNOWN_BUGS

-$Id: KNOWN_BUGS,v 1.3 2000/07/19 15:08:55 brianp Exp $
 
 
 Performance issues with EXT_point_parameters & quake2

src/mesa/main/Makefile.OSMesa16

-# $Id: Makefile.OSMesa16,v 1.9 2002/10/25 13:50:48 brianp Exp $
 
 # Mesa 3-D graphics library
 # Version:  4.1

src/mesa/main/Makefile.X11

-# $Id: Makefile.X11,v 1.72.4.1 2002/11/21 14:59:05 brianp Exp $
 
 # Mesa 3-D graphics library
 # Version:  5.0

src/mesa/main/accum.c

-/* $Id: accum.c,v 1.39.4.1 2003/03/20 09:19:50 keithw Exp $ */
 
 /*
  * Mesa 3-D graphics library

src/mesa/main/accum.h

@@ -32,7 +32,6 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-/* $Id: accum.h,v 1.6.8.3 2003/03/23 23:22:47 jrfonseca Exp $ */
 
 
 #ifndef ACCUM_H

src/mesa/main/api_arrayelt.c

-/* $Id: api_arrayelt.c,v 1.11 2002/10/29 20:28:36 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library

src/mesa/main/api_arrayelt.h

-/* $Id: api_arrayelt.h,v 1.1 2001/06/01 22:22:10 keithw Exp $ */
 
 /*
  * Mesa 3-D graphics library

src/mesa/main/api_eval.c

-/* $Id: api_eval.c,v 1.3 2002/10/29 20:28:42 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library

src/mesa/main/api_eval.h

-/* $Id: api_eval.h,v 1.1 2001/06/04 13:57:35 keithw Exp $ */
 
 /*
  * Mesa 3-D graphics library

src/mesa/main/api_loopback.c

-/* $Id: api_loopback.c,v 1.17 2002/10/29 20:28:43 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library

src/mesa/main/api_loopback.h

@@ -22,7 +22,6 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-/* $Id: api_loopback.h,v 1.2.8.1 2003/03/23 14:58:08 jrfonseca Exp $ */
 
 
 #ifndef API_LOOPBACK_H

src/mesa/main/api_noop.c

-/* $Id: api_noop.c,v 1.10 2002/04/09 16:56:50 keithw Exp $ */
 
 /*
  * Mesa 3-D graphics library

src/mesa/main/api_noop.h

-/* $Id: api_noop.h,v 1.5 2002/04/09 16:56:50 keithw Exp $ */
 
 /*
  * Mesa 3-D graphics library

src/mesa/main/api_validate.c

-/* $Id: api_validate.c,v 1.7 2002/10/24 23:57:19 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library

src/mesa/main/api_validate.h

-/* $Id: api_validate.h,v 1.2 2001/03/12 00:48:37 gareth Exp $ */
 
 /*
  * Mesa 3-D graphics library

src/mesa/main/attrib.c

-/* $Id: attrib.c,v 1.75.4.1 2003/03/20 09:19:51 keithw Exp $ */
 
 /*
  * Mesa 3-D graphics library

src/mesa/main/attrib.h

@@ -32,7 +32,6 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-/* $Id: attrib.h,v 1.6.6.3 2003/03/23 23:22:47 jrfonseca Exp $ */
 
 
 #ifndef ATTRIB_H

src/mesa/main/blend.c

@@ -27,7 +27,6 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-/* $Id: blend.c,v 1.38.4.6 2003/05/18 21:17:00 jrfonseca Exp $ */
 
 
 #include "glheader.h"

src/mesa/main/blend.h

@@ -27,7 +27,6 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-/* $Id: blend.h,v 1.9.8.3 2003/03/22 16:49:58 jrfonseca Exp $ */
 
 
 #ifndef BLEND_H

src/mesa/main/buffers.c

@@ -27,7 +27,6 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-/* $Id: buffers.c,v 1.42.4.5 2003/05/18 21:17:00 jrfonseca Exp $ */
 
 
 #include "glheader.h"