Merging XORG-CURRENT into trunk

15 files changed, 15 insertions, 15 deletions

diff --git a/lbx/lbxcmap.c b/lbx/lbxcmap.c
index 25ef34426..b1366aa3f 100644
--- a/lbx/lbxcmap.c
+++ b/lbx/lbxcmap.c
@@ -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/Xserver/lbx/lbxcmap.c,v 1.10 2001/12/14 19:59:59 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/lbx/lbxcmap.c,v 1.9 2001/08/23 14:46:57 alanh Exp $ */
 
 #include <sys/types.h>
 #define NEED_REPLIES
diff --git a/lbx/lbxdix.c b/lbx/lbxdix.c
index 5a40614f6..c392e6415 100644
--- a/lbx/lbxdix.c
+++ b/lbx/lbxdix.c
@@ -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/Xserver/lbx/lbxdix.c,v 1.8 2001/12/14 19:59:59 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/lbx/lbxdix.c,v 1.7 2001/08/23 14:46:57 alanh Exp $ */
 
 /* various bits of DIX-level mangling */
 
diff --git a/lbx/lbxexts.c b/lbx/lbxexts.c
index d611a7f2c..7ae70ebde 100644
--- a/lbx/lbxexts.c
+++ b/lbx/lbxexts.c
@@ -21,7 +21,7 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  */
-/* $XFree86: xc/programs/Xserver/lbx/lbxexts.c,v 1.4 2001/02/16 13:24:10 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/lbx/lbxexts.c,v 1.2 2000/05/18 23:46:24 dawes Exp $ */
 
 #include "X.h"
 #include "Xproto.h"
diff --git a/lbx/lbxgfx.c b/lbx/lbxgfx.c
index 6eb7af197..5a468ecbf 100644
--- a/lbx/lbxgfx.c
+++ b/lbx/lbxgfx.c
@@ -21,7 +21,7 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  */
-/* $XFree86: xc/programs/Xserver/lbx/lbxgfx.c,v 1.4 2001/08/23 14:46:57 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/lbx/lbxgfx.c,v 1.3 2001/01/17 22:36:59 dawes Exp $ */
 
 /* various bits of DIX-level mangling */
 
diff --git a/lbx/lbxmain.c b/lbx/lbxmain.c
index 1a82ce3b3..443bb0414 100644
--- a/lbx/lbxmain.c
+++ b/lbx/lbxmain.c
@@ -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/Xserver/lbx/lbxmain.c,v 1.13 2001/12/14 20:00:00 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/lbx/lbxmain.c,v 1.12 2001/10/28 03:34:12 tsi Exp $ */
  
 #include <sys/types.h>
 #define NEED_REPLIES
diff --git a/lbx/lbxopts.c b/lbx/lbxopts.c
index 461f0d778..fdef2db7c 100644
--- a/lbx/lbxopts.c
+++ b/lbx/lbxopts.c
@@ -21,7 +21,7 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  */
-/* $XFree86: xc/programs/Xserver/lbx/lbxopts.c,v 1.6 2001/10/28 03:34:12 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/lbx/lbxopts.c,v 1.5 2001/01/17 22:37:00 dawes Exp $ */
 
 #ifdef OPTDEBUG
 #include <stdio.h>
diff --git a/lbx/lbxprop.c b/lbx/lbxprop.c
index e9a6d8a8e..9082250d6 100644
--- a/lbx/lbxprop.c
+++ b/lbx/lbxprop.c
@@ -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/Xserver/lbx/lbxprop.c,v 1.5 2001/12/14 20:00:00 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/lbx/lbxprop.c,v 1.4 2001/05/15 10:19:43 eich Exp $ */
 
 /* various bits of DIX-level mangling */
 
diff --git a/lbx/lbxserve.h b/lbx/lbxserve.h
index 40a2ff0ae..eeff64804 100644
--- a/lbx/lbxserve.h
+++ b/lbx/lbxserve.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/Xserver/lbx/lbxserve.h,v 1.5 2001/12/14 20:00:00 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/lbx/lbxserve.h,v 1.4 2001/08/01 00:44:58 tsi Exp $ */
 
 #ifndef _LBXSERVE_H_
 
diff --git a/lbx/lbxsquish.c b/lbx/lbxsquish.c
index d71647091..f3dc13163 100644
--- a/lbx/lbxsquish.c
+++ b/lbx/lbxsquish.c
@@ -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/Xserver/lbx/lbxsquish.c,v 1.4 2001/12/14 20:00:01 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/lbx/lbxsquish.c,v 1.3 2001/01/17 22:37:00 dawes Exp $ */
 #define NEED_REPLIES
 #define NEED_EVENTS
 #include "X.h"
diff --git a/lbx/lbxsrvopts.h b/lbx/lbxsrvopts.h
index eeb94f266..ea7f2420e 100644
--- a/lbx/lbxsrvopts.h
+++ b/lbx/lbxsrvopts.h
@@ -21,7 +21,7 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  */
-/* $XFree86: xc/programs/Xserver/lbx/lbxsrvopts.h,v 1.3 2001/01/17 22:37:00 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/lbx/lbxsrvopts.h,v 1.2 2000/05/18 23:46:24 dawes Exp $ */
 
 #ifndef _LBX_SRVOPTS_H_
 #define _LBX_SRVOPTS_H_
diff --git a/lbx/lbxswap.c b/lbx/lbxswap.c
index edfc0bea7..23fdd30f7 100644
--- a/lbx/lbxswap.c
+++ b/lbx/lbxswap.c
@@ -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/Xserver/lbx/lbxswap.c,v 1.4 2001/12/14 20:00:01 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/lbx/lbxswap.c,v 1.3 2001/01/17 22:37:00 dawes Exp $ */
 
 #include <sys/types.h>
 #define NEED_REPLIES
diff --git a/lbx/lbxtables.c b/lbx/lbxtables.c
index e071846e3..26a635f6f 100644
--- a/lbx/lbxtables.c
+++ b/lbx/lbxtables.c
@@ -21,7 +21,7 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  */
-/* $XFree86: xc/programs/Xserver/lbx/lbxtables.c,v 1.3 2001/01/17 22:37:00 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/lbx/lbxtables.c,v 1.2 2000/05/18 23:46:24 dawes Exp $ */
 #include "dix.h"
 
 extern int ProcInitialConnection(ClientPtr client);
diff --git a/lbx/lbxtags.c b/lbx/lbxtags.c
index 5b1d65a4a..6fdc4d5a2 100644
--- a/lbx/lbxtags.c
+++ b/lbx/lbxtags.c
@@ -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/Xserver/lbx/lbxtags.c,v 1.4 2001/12/14 20:00:01 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/lbx/lbxtags.c,v 1.3 2001/01/17 22:37:00 dawes Exp $ */
 
 #include "X.h"
 #include "misc.h"
diff --git a/lbx/lbxtags.h b/lbx/lbxtags.h
index e451ad091..376a4cc27 100644
--- a/lbx/lbxtags.h
+++ b/lbx/lbxtags.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/Xserver/lbx/lbxtags.h,v 1.4 2001/12/14 20:00:01 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/lbx/lbxtags.h,v 1.3 2001/01/17 22:37:00 dawes Exp $ */
 
 #ifndef _LBXTAGS_H_
 #define _LBXTAGS_H_
diff --git a/lbx/lbxzerorep.c b/lbx/lbxzerorep.c
index 50b424708..20d58b37b 100644
--- a/lbx/lbxzerorep.c
+++ b/lbx/lbxzerorep.c
@@ -27,7 +27,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/Xserver/lbx/lbxzerorep.c,v 1.4 2001/12/14 20:00:02 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/lbx/lbxzerorep.c,v 1.3 2001/01/17 22:37:00 dawes Exp $ */
 
 /*
  * This module handles zeroing out unused pad bytes in core X replies.