summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-04-23 18:43:06 +0000
committerEgbert Eich <eich@suse.de>2004-04-23 18:43:06 +0000
commit5c06668fc4ea80cf438fe2a02760d9b645310fb3 (patch)
treeb4ce0d0ac001f759c6e0fdc75c1b5518f61a426a
parentb9e4e0f0c33cb97bc8bb564bd53b6c2e1b0e2f42 (diff)
Merging XORG-CURRENT into trunk
-rw-r--r--xtrapbits.h2
-rw-r--r--xtrapddmi.h2
-rw-r--r--xtrapdi.h2
-rw-r--r--xtrapemacros.h2
-rw-r--r--xtraplib.h2
-rw-r--r--xtraplibp.h2
-rw-r--r--xtrapproto.h2
7 files changed, 7 insertions, 7 deletions
diff --git a/xtrapbits.h b/xtrapbits.h
index dc8b7f2..1189dc7 100644
--- a/xtrapbits.h
+++ b/xtrapbits.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/include/extensions/xtrapbits.h,v 1.1 2001/11/02 23:29:26 dawes Exp $ */
+/* $XFree86$ */
/*
* This include file is designed to be a portable way for systems to define
* bit field manipulation of arrays of bits.
diff --git a/xtrapddmi.h b/xtrapddmi.h
index 9617758..c187a3a 100644
--- a/xtrapddmi.h
+++ b/xtrapddmi.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/include/extensions/xtrapddmi.h,v 1.1 2001/11/02 23:29:26 dawes Exp $ */
+/* $XFree86$ */
#ifndef __XTRAPDDMI__
#define __XTRAPDDMI__
diff --git a/xtrapdi.h b/xtrapdi.h
index fee9ee0..9db13bb 100644
--- a/xtrapdi.h
+++ b/xtrapdi.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/include/extensions/xtrapdi.h,v 1.1 2001/11/02 23:29:26 dawes Exp $ */
+/* $XFree86$ */
#ifndef __XTRAPDI__
#define __XTRAPDI__
diff --git a/xtrapemacros.h b/xtrapemacros.h
index 2a16eb2..f59ea33 100644
--- a/xtrapemacros.h
+++ b/xtrapemacros.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/include/extensions/xtrapemacros.h,v 1.2 2001/11/21 23:06:58 tsi Exp $ */
+/* $XFree86: xc/include/extensions/xtrapemacros.h,v 1.1 2001/11/02 23:29:26 dawes Exp $ */
#ifndef __XTRAPEMACROS__
#define __XTRAPEMACROS__ "@(#)xtrapemacros.h 1.9 - 90/09/18 "
diff --git a/xtraplib.h b/xtraplib.h
index 2d50cfc..f3f273a 100644
--- a/xtraplib.h
+++ b/xtraplib.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/include/extensions/xtraplib.h,v 1.1 2001/11/02 23:29:26 dawes Exp $ */
+/* $XFree86$ */
#ifndef __XTRAPLIB__
#define __XTRAPLIB__
diff --git a/xtraplibp.h b/xtraplibp.h
index 94bf104..087ba6e 100644
--- a/xtraplibp.h
+++ b/xtraplibp.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/include/extensions/xtraplibp.h,v 1.1 2001/11/02 23:29:26 dawes Exp $ */
+/* $XFree86$ */
#ifndef __XTRAPLIBP__
#define __XTRAPLIBP__
diff --git a/xtrapproto.h b/xtrapproto.h
index 9b05782..b3e29cf 100644
--- a/xtrapproto.h
+++ b/xtrapproto.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/include/extensions/xtrapproto.h,v 1.2 2002/02/22 21:32:51 dawes Exp $ */
+/* $XFree86: xc/include/extensions/xtrapproto.h,v 1.1 2001/11/02 23:29:26 dawes Exp $ */
#ifndef __XTRAPPROTO__
#define __XTRAPPROTO__