diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:12 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:12 +0000 |
| commit | 8122d8ab00ea43415ac7d9b8bde2c5c7871667aa (patch) | |
| tree | 24d13a509fe596a8322055402ab59986e80a69dd /appres.c | |
| parent | 352d25708d6b20a2b4efe9eba74770f8cfac3c22 (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 'appres.c')
| -rw-r--r-- | appres.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -27,7 +27,7 @@ in this Software without prior written authorization from The Open Group. * Author: Jim Fulton, MIT X Consortium */ -/* $XFree86: xc/programs/appres/appres.c,v 1.4 2001/12/14 20:00:38 dawes Exp $ */ +/* $XFree86: xc/programs/appres/appres.c,v 1.3 2001/01/17 23:44:49 dawes Exp $ */ #include <X11/Intrinsic.h> #include <stdio.h> |