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

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

diff --git a/xfsinfo.c b/xfsinfo.c
index 14d2307..b78a084 100644
--- a/xfsinfo.c
+++ b/xfsinfo.c
@@ -30,7 +30,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/xfsinfo/xfsinfo.c,v 1.4 2001/12/14 20:01:42 dawes Exp $ */
+/* $XFree86: xc/programs/xfsinfo/xfsinfo.c,v 1.3 2001/08/27 17:41:02 dawes Exp $ */
 
 /*
  * Copyright 1990 Network Computing Devices;
diff --git a/xfsinfo.man b/xfsinfo.man
index 3a6918d..7a4e030 100644
--- a/xfsinfo.man
+++ b/xfsinfo.man
@@ -24,7 +24,7 @@
 .\" other dealings in this Software without prior written authorization
 .\" from The Open Group.
 .\"
-.\" $XFree86: xc/programs/xfsinfo/xfsinfo.man,v 1.5 2001/12/14 20:01:42 dawes Exp $
+.\" $XFree86: xc/programs/xfsinfo/xfsinfo.man,v 1.4 2001/04/18 16:13:23 dawes Exp $
 .\"
 .TH XFSINFO 1 __xorgversion__
 .SH NAME
-- 
cgit v1.2.3