diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:13 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:13 +0000 |
| commit | 58890f97461e43807bebec89e1025f7f45ab4356 (patch) | |
| tree | 3a738e40c0b53ae26e2e36c2ec3d582fa88dcc80 /editresP.h | |
| parent | fa4ef1a243718070d41d20527a9dfbd695c28f8c (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 'editresP.h')
| -rw-r--r-- | editresP.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -26,7 +26,7 @@ in this Software without prior written authorization from The Open Group. * * Author: Chris D. Peterson, MIT X Consortium */ -/* $XFree86: xc/programs/editres/editresP.h,v 1.7 2001/12/14 20:00:42 dawes Exp $ */ +/* $XFree86: xc/programs/editres/editresP.h,v 1.6 2001/07/25 15:05:13 dawes Exp $ */ #include <X11/Xmu/EditresP.h> #include <X11/Xresource.h> |