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

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

diff --git a/xvinfo.c b/xvinfo.c
index 77e9eff..e9a4c36 100644
--- a/xvinfo.c
+++ b/xvinfo.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/xvinfo/xvinfo.c,v 1.8 2002/01/22 23:05:43 mvojkovi Exp $ */
+/* $XFree86: xc/programs/xvinfo/xvinfo.c,v 1.7 2001/10/28 03:34:43 tsi Exp $ */
 
 #include <X11/X.h>
 #include <X11/Xlib.h>
diff --git a/xvinfo.man b/xvinfo.man
index 3f62ddd..663207a 100644
--- a/xvinfo.man
+++ b/xvinfo.man
@@ -1,5 +1,5 @@
 
-.\" $XFree86: xc/programs/xvinfo/xvinfo.man,v 1.3 2001/01/27 18:21:25 dawes Exp $
+.\" $XFree86: xc/programs/xvinfo/xvinfo.man,v 1.2 2001/01/24 00:06:51 dawes Exp $
 .\"
 .TH xvinfo 1 __vendorversion__
 .SH NAME
-- 
cgit v1.2.3