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

---
 mkfontdir.cpp | 2 +-
 mkfontdir.man | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mkfontdir.cpp b/mkfontdir.cpp
index 6fff51d..e734bb1 100755
--- a/mkfontdir.cpp
+++ b/mkfontdir.cpp
@@ -1,4 +1,4 @@
 XCOMM!/bin/sh
-XCOMM $XFree86: xc/programs/mkfontdir/mkfontdir.cpp,v 1.1 2003/11/14 02:42:07 dawes Exp $
+XCOMM $XFree86: xc/programs/mkfontdir/mkfontdir,v 1.2 2003/07/18 14:51:43 tsi Exp $
 
 exec BINDIR/mkfontscale -b -s -l "$@"
diff --git a/mkfontdir.man b/mkfontdir.man
index c9a2329..aa2485b 100644
--- a/mkfontdir.man
+++ b/mkfontdir.man
@@ -23,7 +23,7 @@
 .\" other dealings in this Software without prior written authorization
 .\" from The Open Group.
 .\"
-.\" $XFree86: xc/programs/mkfontdir/mkfontdir.man,v 1.15 2001/12/14 20:00:59 dawes Exp $
+.\" $XFree86: xc/programs/mkfontdir/mkfontdir.man,v 1.14 2001/11/01 23:35:34 dawes Exp $
 .\"
 .TH MKFONTDIR 1 __xorgversion__
 .SH NAME
-- 
cgit v1.2.3