diff options
author | Egbert Eich <eich@suse.de> | 2004-03-05 13:38:36 +0000 |
---|---|---|
committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:38:36 +0000 |
commit | 61ccd809c1ca151808f8c58d81abf38bbd211ff5 (patch) | |
tree | 2326842ad31be4a6899598b0bf221bc5aacc6356 /sxpm/sxpm.c | |
parent | 8636e5cc7ce7ce5ac913e6a59e2a8e1ea9065b1e (diff) | |
download | xorg-lib-libXpm-61ccd809c1ca151808f8c58d81abf38bbd211ff5.tar.gz |
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 'sxpm/sxpm.c')
-rw-r--r-- | sxpm/sxpm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sxpm/sxpm.c b/sxpm/sxpm.c index b98ea9f..9d0b42e 100644 --- a/sxpm/sxpm.c +++ b/sxpm/sxpm.c @@ -22,7 +22,7 @@ * used in advertising or otherwise to promote the sale, use or other dealings * in this Software without prior written authorization from GROUPE BULL. */ -/* $XFree86: xc/extras/Xpm/sxpm/sxpm.c,v 1.3 2001/10/28 03:32:13 tsi Exp $ */ +/* $XFree86: xc/extras/Xpm/sxpm/sxpm.c,v 1.2 2001/08/01 00:44:34 tsi Exp $ */ /*****************************************************************************\ * sxpm.c: * |