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 | a572da959e8b437ac1fbbce0a28fbe5ee9c41974 (patch) | |
| tree | acbe70fb3a974dcdaf452634c2a925ff1fe5097d /Bitmap.c | |
| parent | 8cecc3c57442851cdbe5e3bb24be7892eb397803 (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 'Bitmap.c')
| -rw-r--r-- | Bitmap.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/bitmap/Bitmap.c,v 1.6 2002/02/18 21:43:17 herrb Exp $ */ +/* $XFree86: Bitmap.c,v 1.5 2001/12/26 21:39:34 paulo Exp $ */ /* * Author: Davor Matic, MIT X Consortium |