diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-05 13:38:52 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:38:52 +0000 |
| commit | c6ba06c1ba66235b9b1ef1f4f629bb19bcbcdbe5 (patch) | |
| tree | 95516047ad2ee8e190aae691218c58678d30ff85 | |
| parent | bb5a469bc6137857a3a057989c47a2c2dda68716 (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).
| -rw-r--r-- | render.h | 2 | ||||
| -rw-r--r-- | renderproto.h | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -1,5 +1,5 @@ /* - * $XFree86: xc/include/extensions/render.h,v 1.11 2002/11/23 02:34:45 keithp Exp $ + * $XFree86: xc/include/extensions/render.h,v 1.10 2002/11/06 22:47:49 keithp Exp $ * * Copyright © 2000 SuSE, Inc. * diff --git a/renderproto.h b/renderproto.h index 7717d9f..4b5da46 100644 --- a/renderproto.h +++ b/renderproto.h @@ -1,5 +1,5 @@ /* - * $XFree86: xc/include/extensions/renderproto.h,v 1.13 2002/11/23 02:34:45 keithp Exp $ + * $XFree86: xc/include/extensions/renderproto.h,v 1.12 2002/09/26 02:56:48 keithp Exp $ * * Copyright © 2000 SuSE, Inc. * |