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 | 505fe2ba307e9270627ca7f3cb6b4e1dbacc327b (patch) | |
| tree | ad19dfe52ca3f84a6f669acac195d296ed38ad08 /Xext/panoramiX.h | |
| parent | 1b22db1ebcf1ba98ca8519fa38210e275373f8f6 (diff) | |
23. Merged with XFree86 4.4.0. Added changes that went into infected files.
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 'Xext/panoramiX.h')
| -rw-r--r-- | Xext/panoramiX.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Xext/panoramiX.h b/Xext/panoramiX.h index d01b0b854..1222bbaf2 100644 --- a/Xext/panoramiX.h +++ b/Xext/panoramiX.h @@ -19,7 +19,7 @@ * or in FAR 52.227-19, as applicable. * * * *****************************************************************/ -/* $XFree86: xc/programs/Xserver/Xext/panoramiX.h,v 1.6 2003/03/23 04:56:02 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/panoramiX.h,v 1.5 2001/01/03 02:54:17 keithp Exp $ */ /* THIS IS NOT AN X PROJECT TEAM SPECIFICATION */ |