Merging XORG-CURRENT into trunkrel-0-6-1lg3d-rel-0-7-0lg3d-rel-0-6-2lg3d-baseXORG-6_8_2XORG-6_8_1_904XORG-6_8_1_903XORG-6_8_1_902XORG-6_8_1_901XORG-6_8_1XORG-6_8_0XORG-6_7_99_904XORG-6_7_99_903XORG-6_7_99_902XORG-6_7_99_901XORG-6_7_99_2XORG-6_7_99_1XACE-SELINUX-MERGEXORG-6_8-branch

16 files changed, 16 insertions, 16 deletions

diff --git a/include/atomcache.h b/include/atomcache.h
index cf65008..b70f792 100644
--- a/include/atomcache.h
+++ b/include/atomcache.h
@@ -46,7 +46,7 @@ in this Software without prior written authorization from The Open Group.
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  * 
  */
-/* $XFree86: xc/programs/lbxproxy/include/atomcache.h,v 1.6 2003/11/17 22:20:48 dawes Exp $ */
+/* $XFree86$ */
 
 #ifndef _ATOMCACHE_H_
 #define _ATOMCACHE_H_
diff --git a/include/cache.h b/include/cache.h
index 66fd0e5..c8ffdff 100644
--- a/include/cache.h
+++ b/include/cache.h
@@ -50,7 +50,7 @@ from The Open Group.
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  */
-/* $XFree86: xc/programs/lbxproxy/include/cache.h,v 1.7 2003/11/17 22:20:48 dawes Exp $ */
+/* $XFree86$ */
 
 #ifndef _CACHE_H_
 #define	_CACHE_H_
diff --git a/include/colormap.h b/include/colormap.h
index 561e5fa..425abd2 100644
--- a/include/colormap.h
+++ b/include/colormap.h
@@ -46,7 +46,7 @@ in this Software without prior written authorization from The Open Group.
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  * 
  */
-/* $XFree86: xc/programs/lbxproxy/include/colormap.h,v 1.7 2003/11/17 22:20:48 dawes Exp $ */
+/* $XFree86: xc/programs/lbxproxy/include/colormap.h,v 1.6 2001/12/14 20:00:55 dawes Exp $ */
 
 #ifndef COLORMAP_H_
 #define COLORMAP_H_
diff --git a/include/init.h b/include/init.h
index dc73d40..2ac786e 100644
--- a/include/init.h
+++ b/include/init.h
@@ -45,7 +45,7 @@ in this Software without prior written authorization from The Open Group.
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  */
-/* $XFree86: xc/programs/lbxproxy/include/init.h,v 1.3 2003/11/17 22:20:48 dawes Exp $ */
+/* $XFree86$ */
 
 #ifndef _INIT_H_
 #define _INIT_H_
diff --git a/include/lbx.h b/include/lbx.h
index 8993166..a95e29b 100644
--- a/include/lbx.h
+++ b/include/lbx.h
@@ -45,7 +45,7 @@ in this Software without prior written authorization from The Open Group.
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  */
-/* $XFree86: xc/programs/lbxproxy/include/lbx.h,v 1.7 2003/11/17 22:20:48 dawes Exp $ */
+/* $XFree86: xc/programs/lbxproxy/include/lbx.h,v 1.6 2001/12/14 20:00:55 dawes Exp $ */
 
 #ifndef _LBX_H_
 #define _LBX_H_
diff --git a/include/lbxext.h b/include/lbxext.h
index 2ce3485..637ec04 100644
--- a/include/lbxext.h
+++ b/include/lbxext.h
@@ -46,7 +46,7 @@ in this Software without prior written authorization from The Open Group.
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  */
-/* $XFree86: xc/programs/lbxproxy/include/lbxext.h,v 1.3 2003/11/17 22:20:48 dawes Exp $ */
+/* $XFree86$ */
 
 #ifndef _LBXEXT_H_
 #define _LBXEXT_H_
diff --git a/include/misc.h b/include/misc.h
index 526372a..19c6011 100644
--- a/include/misc.h
+++ b/include/misc.h
@@ -27,7 +27,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/lbxproxy/include/misc.h,v 1.7 2001/12/14 20:00:55 dawes Exp $ */
+/* $XFree86: xc/programs/lbxproxy/include/misc.h,v 1.6 2001/08/01 00:45:01 tsi Exp $ */
 
 #ifndef MISC_H
 #define MISC_H 1
diff --git a/include/os.h b/include/os.h
index 2dca444..74da4e8 100644
--- a/include/os.h
+++ b/include/os.h
@@ -27,7 +27,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/lbxproxy/include/os.h,v 1.8 2003/11/17 22:20:48 dawes Exp $ */
+/* $XFree86: xc/programs/lbxproxy/include/os.h,v 1.7 2001/12/14 20:00:55 dawes Exp $ */
 
 #ifndef OS_H
 #define OS_H
diff --git a/include/pm.h b/include/pm.h
index efd3dd8..95e71bd 100644
--- a/include/pm.h
+++ b/include/pm.h
@@ -25,7 +25,7 @@ not be used in advertising or otherwise to promote the sale, use or
 other dealings in this Software without prior written authorization
 from The Open Group.
 */
-/* $XFree86: xc/programs/lbxproxy/include/pm.h,v 1.5 2003/11/17 22:20:48 dawes Exp $ */
+/* $XFree86$ */
 
 #include <X11/ICE/ICElib.h>
 
diff --git a/include/proxyopts.h b/include/proxyopts.h
index 6abce40..ac676c4 100644
--- a/include/proxyopts.h
+++ b/include/proxyopts.h
@@ -46,7 +46,7 @@ in this Software without prior written authorization from The Open Group.
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  */
-/* $XFree86: xc/programs/lbxproxy/include/proxyopts.h,v 1.6 2003/11/17 22:20:48 dawes Exp $ */
+/* $XFree86$ */
 
 #ifndef _LBX_PROXYOPTS_H_
 #define _LBX_PROXYOPTS_H_
diff --git a/include/reqtype.h b/include/reqtype.h
index 67e378c..2968824 100644
--- a/include/reqtype.h
+++ b/include/reqtype.h
@@ -46,7 +46,7 @@ in this Software without prior written authorization from The Open Group.
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  */
-/* $XFree86: xc/programs/lbxproxy/include/reqtype.h,v 1.6 2003/11/17 22:20:49 dawes Exp $ */
+/* $XFree86$ */
 
 #ifndef	_REQTYPE_H_
 #define	_REQTYPE_H_
diff --git a/include/resource.h b/include/resource.h
index 164f867..a3662ec 100644
--- a/include/resource.h
+++ b/include/resource.h
@@ -27,7 +27,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/lbxproxy/include/resource.h,v 1.6 2003/11/17 22:20:49 dawes Exp $ */
+/* $XFree86$ */
 
 #ifndef RESOURCE_H
 #define RESOURCE_H 1
diff --git a/include/swap.h b/include/swap.h
index 9d50be1..d52eab4 100644
--- a/include/swap.h
+++ b/include/swap.h
@@ -22,7 +22,7 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  */
-/* $XFree86: xc/programs/lbxproxy/include/swap.h,v 1.3 2003/11/17 22:20:49 dawes Exp $ */
+/* $XFree86: xc/programs/lbxproxy/include/swap.h,v 1.2 2001/08/01 00:45:01 tsi Exp $ */
 
 #ifndef _SWAP_H_
 #define _SWAP_H_
diff --git a/include/tags.h b/include/tags.h
index 94b9975..866a5b8 100644
--- a/include/tags.h
+++ b/include/tags.h
@@ -46,7 +46,7 @@ in this Software without prior written authorization from The Open Group.
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  */
-/* $XFree86: xc/programs/lbxproxy/include/tags.h,v 1.6 2003/11/17 22:20:49 dawes Exp $ */
+/* $XFree86$ */
 
 #ifndef _TAGS_H_
 #define _TAGS_H_
diff --git a/include/util.h b/include/util.h
index 0e1683f..f7d073b 100644
--- a/include/util.h
+++ b/include/util.h
@@ -46,7 +46,7 @@ in this Software without prior written authorization from The Open Group.
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  * 
  */
-/* $XFree86: xc/programs/lbxproxy/include/util.h,v 1.8 2003/11/17 22:20:49 dawes Exp $ */
+/* $XFree86: xc/programs/lbxproxy/include/util.h,v 1.7 2001/12/14 20:00:56 dawes Exp $ */
 
 #ifndef	_UTIL_H_
 #define	_UTIL_H_
diff --git a/include/wire.h b/include/wire.h
index f301f91..9b71204 100644
--- a/include/wire.h
+++ b/include/wire.h
@@ -45,7 +45,7 @@ in this Software without prior written authorization from The Open Group.
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  */
-/* $XFree86: xc/programs/lbxproxy/include/wire.h,v 1.8 2003/11/17 22:20:49 dawes Exp $ */
+/* $XFree86: xc/programs/lbxproxy/include/wire.h,v 1.7 2001/12/14 20:00:56 dawes Exp $ */
 
 #ifdef DEBUG 		/* Need this here because lbx.h undef's DEBUG */
 extern int lbxDebug;