diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:42 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:42 +0000 |
| commit | 99037a13d36fdce31917219a6eb396b75bd55cd6 (patch) | |
| tree | 3cb43ba20c831a30a3bf7eae89aba844983f613d /xtrapreset.c | |
| parent | 953c61b4753fa990f6f5e0dad6ec522f2a932338 (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).
Diffstat (limited to 'xtrapreset.c')
| -rw-r--r-- | xtrapreset.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xtrapreset.c b/xtrapreset.c index 1eda765..11a919a 100644 --- a/xtrapreset.c +++ b/xtrapreset.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/xtrap/xtrapreset.c,v 1.2 2002/09/18 17:11:57 tsi Exp $ */ +/* $XFree86: xc/programs/xtrap/xtrapreset.c,v 1.1tsi Exp $ */ /* * @DEC_COPYRIGHT@ */ |