diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:18 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:18 +0000 |
| commit | 32374e99f9712871cee0f1ee01c227cb1cf7cec7 (patch) | |
| tree | db69f6c2b156c52280fa40e6c35b64320a802862 /viewres.c | |
| parent | f1e26d46f119c241a78690c8fdb9e9f7604c25a6 (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 'viewres.c')
| -rw-r--r-- | viewres.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -27,7 +27,7 @@ in this Software without prior written authorization from the X Consortium. * * * Author: Jim Fulton, MIT X Consortium */ -/* $XFree86: xc/programs/viewres/viewres.c,v 1.7 2003/09/08 20:49:47 herrb Exp $ */ +/* $XFree86: xc/programs/viewres/viewres.c,v 1.6 2003/05/27 22:26:58 tsi Exp $ */ #include <stdio.h> #include <stdlib.h> |