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 | 78261f998a1e6deb2bbac3ad4bccbbd097252715 (patch) | |
| tree | d94efb782fa291f8c873458bb61591f79c992918 | |
| parent | fdf93da135aad8022e2c41b44c40da7d6800cebb (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-- | xf86rush.h | 2 | ||||
| -rw-r--r-- | xf86rushstr.h | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -1,4 +1,4 @@ -/* $XFree86: xc/include/extensions/xf86rush.h,v 1.5 2003/11/17 22:20:04 dawes Exp $ */ +/* $XFree86: xc/include/extensions/xf86rush.h,v 1.4 2000/02/29 03:09:00 dawes Exp $ */ /* Copyright (c) 1998 Daryll Strauss diff --git a/xf86rushstr.h b/xf86rushstr.h index 33b4d32..8dca46a 100644 --- a/xf86rushstr.h +++ b/xf86rushstr.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/include/extensions/xf86rushstr.h,v 1.5 2001/08/01 00:44:36 tsi Exp $ */ +/* $XFree86: xc/include/extensions/xf86rushstr.h,v 1.4 2000/02/29 03:09:02 dawes Exp $ */ /* Copyright (c) 1998 Daryll Strauss |