diff options
author | Egbert Eich <eich@suse.de> | 2004-03-05 13:38:14 +0000 |
---|---|---|
committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:38:14 +0000 |
commit | 0e02a9707e6e3cc0ce95221a206f69405c293aa2 (patch) | |
tree | 5f6a4758aa3460663e66f2a2a4c334080f7600ca | |
parent | 68d2f4f6cf3766f96240a9372339f3b9335a72f3 (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-- | lndir.c | 2 | ||||
-rw-r--r-- | lndir.man | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -26,7 +26,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/config/util/lndir.c,v 3.19 2004/01/11 00:10:15 herrb Exp $ */ +/* $XFree86: xc/config/util/lndir.c,v 3.18 2003/06/24 15:44:45 eich Exp $ */ /* From the original /bin/sh script: @@ -25,7 +25,7 @@ .\" from The Open Group. .\" .\" -.\" $XFree86: xc/config/util/lndir.man,v 1.5 2003/06/24 15:44:45 eich Exp $ +.\" $XFree86: xc/config/util/lndir.man,v 1.3tsi Exp $ .\" .TH LNDIR 1 __xorgversion__ .SH NAME |