From 91cc9ce7d833b581aa83e04e8fe3f450d9ba15b1 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Fri, 5 Mar 2004 13:41:43 +0000 Subject: 23. Merged with XFree86 4.4.0. Added changes that went into infected files. Reverted darwin/bundle/**/Credits.rtf to XFree86 versions to avoid future conflicts on ASCII but not humal readable files. (There should probably be separate CreditsXorg.rtf files) (Egbert Eich). --- xvidtune.c | 2 +- xvidtune.man | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xvidtune.c b/xvidtune.c index 306145f..1bdf947 100644 --- a/xvidtune.c +++ b/xvidtune.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/xvidtune/xvidtune.c,v 3.36 2003/10/24 20:38:24 tsi Exp $ */ +/* $XFree86: xc/programs/xvidtune/xvidtune.c,v 3.35tsi Exp $ */ /* diff --git a/xvidtune.man b/xvidtune.man index 7713fe6..b77c774 100644 --- a/xvidtune.man +++ b/xvidtune.man @@ -1,4 +1,4 @@ -.\" $XFree86: xc/programs/xvidtune/xvidtune.man,v 3.14 2001/08/13 19:35:01 dawes Exp $ +.\" $XFree86: xc/programs/xvidtune/xvidtune.man,v $ .\" .\" Copyright (c) 1995 Kaleb S. KEITHLEY .\" -- cgit v1.2.3