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 /include | |
| parent | 8636e5cc7ce7ce5ac913e6a59e2a8e1ea9065b1e (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 'include')
| -rw-r--r-- | include/X11/xpm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/X11/xpm.h b/include/X11/xpm.h index 8895323..1cbc3a3 100644 --- a/include/X11/xpm.h +++ b/include/X11/xpm.h @@ -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/lib/xpm.h,v 1.3 2003/11/17 22:20:02 dawes Exp $ */ +/* $XFree86: xc/extras/Xpm/lib/xpm.h,v 1.2 2001/08/22 23:36:44 dawes Exp $ */ /*****************************************************************************\ * xpm.h: * |