From dbaae0652239411598a00da1ee5af65a5b101a98 Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.de>
Date: Fri, 23 Apr 2004 19:54:38 +0000
Subject: Merging XORG-CURRENT into trunk

---
 Mailbox.c  | 2 +-
 MailboxP.h | 2 +-
 xbiff.c    | 2 +-
 xbiff.man  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Mailbox.c b/Mailbox.c
index eb6aad6..5b1cabf 100644
--- a/Mailbox.c
+++ b/Mailbox.c
@@ -28,7 +28,7 @@ other dealings in this Software without prior written authorization
 from the X Consortium.
 
 */
-/* $XFree86: xc/programs/xbiff/Mailbox.c,v 1.5 2001/10/28 03:34:25 tsi Exp $ */
+/* $XFree86: xc/programs/xbiff/Mailbox.c,v 1.4 2001/08/01 00:45:02 tsi Exp $ */
 
 /*
  * Author:  Jim Fulton, MIT X Consortium
diff --git a/MailboxP.h b/MailboxP.h
index c95d241..937f895 100644
--- a/MailboxP.h
+++ b/MailboxP.h
@@ -28,7 +28,7 @@ other dealings in this Software without prior written authorization
 from the X Consortium.
 
 */
-/* $XFree86: xc/programs/xbiff/MailboxP.h,v 1.2 2001/04/19 19:54:51 dawes Exp $ */
+/* $XFree86: xc/programs/xbiff/MailboxP.h,v 1.1 2000/02/13 03:56:12 dawes Exp $ */
 
 #ifndef _XawMailboxP_h
 #define _XawMailboxP_h
diff --git a/xbiff.c b/xbiff.c
index 16c43cf..ac73608 100644
--- a/xbiff.c
+++ b/xbiff.c
@@ -28,7 +28,7 @@ other dealings in this Software without prior written authorization
 from the X Consortium.
 
 */
-/* $XFree86: xc/programs/xbiff/xbiff.c,v 1.4 2003/05/27 22:26:59 tsi Exp $ */
+/* $XFree86: xc/programs/xbiff/xbiff.c,v 1.3tsi Exp $ */
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/xbiff.man b/xbiff.man
index c000d6d..38ba28c 100644
--- a/xbiff.man
+++ b/xbiff.man
@@ -25,7 +25,7 @@
 .\" other dealings in this Software without prior written authorization
 .\" from the X Consortium.
 .\"
-.\" $XFree86: xc/programs/xbiff/xbiff.man,v 1.4 2001/04/19 19:54:51 dawes Exp $
+.\" $XFree86: xc/programs/xbiff/xbiff.man,v 1.3 2001/01/27 18:21:08 dawes Exp $
 .\"
 .TH XBIFF 1 __xorgversion__
 .SH NAME
-- 
cgit v1.2.3