Merging XORG-CURRENT into trunkxprint_packagertest_20041217_basexprint_packagertest_20041125_baserel-0-6-1lg3d-rel-0-7-0lg3d-rel-0-6-2lg3d-baseXORG-6_8_2XORG-6_8_1_904XORG-6_8_1_903XORG-6_8_1_902XORG-6_8_1_901XORG-6_8_1XORG-6_8_0XORG-6_7_99_904XORG-6_7_99_903XORG-6_7_99_902XORG-6_7_99_901XORG-6_7_99_2XORG-6_7_99_1XACE-SELINUX-MERGExprint_packagertest_20041217xprint_packagertest_20041125lg3d-masterlg3d-eventlg3d-dev-0-7-1lg3d-dev-0-7-0lg3d-dev-0-6-latestlg3d-dev-0-6-2lg3d-dev-0-6-1-latestlg3d-dev-0-6-1-currentlg3d-dev-0-6-1-1lg3d-dev-0-6-1lg3dXORG-6_8-branchCOMPOSITEWRAP

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