diff options
author | Egbert Eich <eich@suse.de> | 2004-03-05 13:39:30 +0000 |
---|---|---|
committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:39:30 +0000 |
commit | f8e0bb86ed20b8b3c11eea82ff58172298be6832 (patch) | |
tree | e61e0ef821b7d49872de7f04fbbdeb0b68d9ac29 | |
parent | 1124ceea4f12871b2749c5ba76ee2ae0ee33b0a4 (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-- | src/XF86Rush.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/XF86Rush.c b/src/XF86Rush.c index e07391b..df3a71d 100644 --- a/src/XF86Rush.c +++ b/src/XF86Rush.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/Xxf86rush/XF86Rush.c,v 1.6 2002/10/16 00:37:34 dawes Exp $ */ +/* $XFree86: xc/lib/Xxf86rush/XF86Rush.c,v 1.5 2000/09/26 15:56:59 tsi Exp $ */ /* Copyright (c) 1998 Daryll Strauss |