diff options
author | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:43 +0000 |
---|---|---|
committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:43 +0000 |
commit | 91cc9ce7d833b581aa83e04e8fe3f450d9ba15b1 (patch) | |
tree | 2565836bf215cae1f5494248f20ae0c9015c24f8 | |
parent | 4780e1d92e3d261444c5a8587273881953657903 (diff) |
23. Merged with XFree86 4.4.0. Added changes that went into infected files.XORG-CURRENT-premerge-release-1XACE-SELINUX-BASEDAMAGE-XFIXES-BASEDAMAGE-XFIXES
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).
-rw-r--r-- | xvidtune.c | 2 | ||||
-rw-r--r-- | xvidtune.man | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -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 .\" |