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

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

diff --git a/bdftopcf.c b/bdftopcf.c
index cb82abd..1be7ed8 100644
--- a/bdftopcf.c
+++ b/bdftopcf.c
@@ -27,7 +27,7 @@ from The Open Group.
 
 */
 
-/* $XFree86: xc/programs/bdftopcf/bdftopcf.c,v 1.5 2001/12/14 20:00:39 dawes Exp $ */
+/* $XFree86: xc/programs/bdftopcf/bdftopcf.c,v 1.4 2001/08/01 00:45:00 tsi Exp $ */
 
 #include <X11/X.h>
 #include <X11/Xproto.h>
diff --git a/bdftopcf.man b/bdftopcf.man
index 651cecc..0284691 100644
--- a/bdftopcf.man
+++ b/bdftopcf.man
@@ -23,7 +23,7 @@
 .\" other dealings in this Software without prior written authorization
 .\" from The Open Group.
 .\"
-.\" $XFree86: xc/programs/bdftopcf/bdftopcf.man,v 1.8 2001/12/14 20:00:39 dawes Exp $
+.\" $XFree86: xc/programs/bdftopcf/bdftopcf.man,v 1.7 2001/01/27 18:21:00 dawes Exp $
 .\"
 .TH BDFTOPCF 1 __xorgversion__
 .SH NAME
-- 
cgit v1.2.3