From ae0eaf93e092ac8e8b1c98f3e986de96940663fa Mon Sep 17 00:00:00 2001
From: Keith Whitwell <keith@tungstengraphics.com>
Date: Mon, 24 Nov 2003 15:23:18 +0000
Subject: Merge vtx-0-2-branch

---
 src/mesa/x86/assyntax.h    | 1 -
 src/mesa/x86/common_x86.c  | 1 -
 src/mesa/x86/gen_matypes.c | 1 -
 src/mesa/x86/sse.c         | 1 -
 4 files changed, 4 deletions(-)

(limited to 'src/mesa/x86')

diff --git a/src/mesa/x86/assyntax.h b/src/mesa/x86/assyntax.h
index 7cebb42ace..ebe9c57460 100644
--- a/src/mesa/x86/assyntax.h
+++ b/src/mesa/x86/assyntax.h
@@ -1,4 +1,3 @@
-/* $Id: assyntax.h,v 1.23 2003/10/21 08:33:10 dborca Exp $ */
 
 #ifndef __ASSYNTAX_H__
 #define __ASSYNTAX_H__
diff --git a/src/mesa/x86/common_x86.c b/src/mesa/x86/common_x86.c
index 4a2c778150..1e7f69dba2 100644
--- a/src/mesa/x86/common_x86.c
+++ b/src/mesa/x86/common_x86.c
@@ -1,4 +1,3 @@
-/* $Id: common_x86.c,v 1.24 2003/10/21 23:53:34 kendallb Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/src/mesa/x86/gen_matypes.c b/src/mesa/x86/gen_matypes.c
index b4e7e6b7fd..e57c7326e3 100644
--- a/src/mesa/x86/gen_matypes.c
+++ b/src/mesa/x86/gen_matypes.c
@@ -178,7 +178,6 @@ int main( int argc, char **argv )
    DEFINE( "VERT_BIT_END_VB        ", VERT_BIT_END_VB );
    DEFINE( "VERT_BIT_POINT_SIZE    ", VERT_BIT_POINT_SIZE );
    DEFINE( "VERT_BIT_EYE           ", VERT_BIT_EYE );
-   DEFINE( "VERT_BIT_CLIP          ", VERT_BIT_CLIP );
    printf( "\n" );
    DEFINE( "VERT_BIT_OBJ_23        ", VERT_BIT_OBJ_3 );
    DEFINE( "VERT_BIT_OBJ_234       ", VERT_BIT_OBJ_4 );
diff --git a/src/mesa/x86/sse.c b/src/mesa/x86/sse.c
index 2b824e4c01..1271f88dcd 100644
--- a/src/mesa/x86/sse.c
+++ b/src/mesa/x86/sse.c
@@ -1,4 +1,3 @@
-/* $Id: sse.c,v 1.4 2003/10/21 23:53:34 kendallb Exp $ */
 
 /*
  * Mesa 3-D graphics library
-- 
cgit v1.2.3