diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:27 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:27 +0000 |
| commit | aa42ac4d09fa65d5889c8f01b18e091fbaa96312 (patch) | |
| tree | 909512476e495682e7fc81efbedd039b53953c48 /planemask.c | |
| parent | b01f39a8e6eadd35758fe4301e019b66f238917d (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 'planemask.c')
| -rw-r--r-- | planemask.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/planemask.c b/planemask.c index 1983432..c710562 100644 --- a/planemask.c +++ b/planemask.c @@ -7,7 +7,7 @@ ** functions to create more than one of these planemask choice things ** will fail in a big way. */ -/* $XFree86: xc/programs/xgc/planemask.c,v 1.4 2003/05/07 21:02:07 herrb Exp $ */ +/* $XFree86: xc/programs/xgc/planemask.c,v 1.3 2000/02/17 14:00:37 dawes Exp $ */ #include <X11/Xos.h> #include <stdio.h> |