diff options
author | Egbert Eich <eich@suse.de> | 2004-03-05 13:38:52 +0000 |
---|---|---|
committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:38:52 +0000 |
commit | 249050242a8460f4d4a62b3357dd6971e40f3f83 (patch) | |
tree | b69c484c3ee6a886998bfeb911343672c53e5966 | |
parent | 183d08be58a1a772e95f547cba74da370327a830 (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-- | xf86misc.h | 2 | ||||
-rw-r--r-- | xf86mscstr.h | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -1,4 +1,4 @@ -/* $XFree86: xc/include/extensions/xf86misc.h,v 3.17 2003/04/03 16:15:46 dawes Exp $ */ +/* $XFree86: xc/include/extensions/xf86misc.h,v 3.16 2002/11/20 04:04:56 dawes Exp $ */ /* * Copyright (c) 1995, 1996 The XFree86 Project, Inc diff --git a/xf86mscstr.h b/xf86mscstr.h index e514740..4e527b8 100644 --- a/xf86mscstr.h +++ b/xf86mscstr.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/include/extensions/xf86mscstr.h,v 3.13 2003/04/03 16:15:46 dawes Exp $ */ +/* $XFree86: xc/include/extensions/xf86mscstr.h,v 3.12 2002/11/20 04:04:56 dawes Exp $ */ /* * Copyright (c) 1995, 1996 The XFree86 Project, Inc |