diff options
author | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:38 +0000 |
---|---|---|
committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:38 +0000 |
commit | d3dc2be767a673c367c544e931a1a9f42ccf5905 (patch) | |
tree | 6fe95a6fe98f8a5d707715fda294c9d3bbbfe715 | |
parent | 0af82bd2fa73dabf9bbeb41046737d9e19b69982 (diff) |
23. Merged with XFree86 4.4.0. Added changes that went into infected files.before_20040421_xprint_branch_landingXORG-CURRENT-premerge-release-1XORG-CURRENT-CLOSEDXACE-SELINUX-BASEDAMAGE-XFIXES-BASEXORG-CURRENTXACE-SELINUXDAMAGE-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-- | xsetmode.c | 2 | ||||
-rw-r--r-- | xsetmode.man | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/xsetmode/xsetmode.c,v 3.6 2003/05/27 22:27:09 tsi Exp $ */ +/* $XFree86: xc/programs/xsetmode/xsetmode.c,v 3.5tsi Exp $ */ /* * Copyright 1995 by Frederic Lepied, France. <fred@sugix.frmug.fr.net> diff --git a/xsetmode.man b/xsetmode.man index 22e52c7..84b38bc 100644 --- a/xsetmode.man +++ b/xsetmode.man @@ -1,4 +1,4 @@ -.\" $XFree86: xc/programs/xsetmode/xsetmode.man,v 3.2 2001/01/27 18:21:23 dawes Exp $ +.\" $XFree86: xc/programs/xsetmode/xsetmode.man,v 3.1 1995/12/26 10:43:02 dawes Exp $ .\" .TH xsetmode 1 __vendorversion__ .SH NAME |