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

---
 showfont.c   | 2 +-
 showfont.man | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/showfont.c b/showfont.c
index 0331f9e..b1d1ff7 100644
--- a/showfont.c
+++ b/showfont.c
@@ -49,7 +49,7 @@ other dealings in this Software without prior written authorization
 from the X Consortium.
 
 */
-/* $XFree86: xc/programs/showfont/showfont.c,v 1.4 2001/08/27 17:41:01 dawes Exp $ */
+/* $XFree86: xc/programs/showfont/showfont.c,v 1.3 2000/02/18 12:20:17 tsi Exp $ */
 
 #include	<stdio.h>
 #include	<stdlib.h>
diff --git a/showfont.man b/showfont.man
index 43b52a8..93b052b 100644
--- a/showfont.man
+++ b/showfont.man
@@ -1,5 +1,5 @@
 .\" $XConsortium: showfont.man,v 1.3 94/04/11 14:29:57 gildea Exp $
-.\" $XFree86: xc/programs/showfont/showfont.man,v 1.4 2001/01/27 18:21:06 dawes Exp $
+.\" $XFree86: xc/programs/showfont/showfont.man,v 1.3 2000/02/17 14:00:33 dawes Exp $
 .TH SHOWFONT 1 __xorgversion__
 .SH NAME
 showfont \- font dumper for X font server
-- 
cgit v1.2.3