diff options
author | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:23 +0000 |
---|---|---|
committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:23 +0000 |
commit | 3d4783e06169c3b96eea0a9826c06d8c6a12ae02 (patch) | |
tree | 1008a7775a52ce81a8b28a5ff5cf2bc58527d5ff /lisp/pathname.h | |
parent | 6503c7eb0c08963d1842ecbae540e40fc408f6f1 (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-BASE
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 'lisp/pathname.h')
-rw-r--r-- | lisp/pathname.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/pathname.h b/lisp/pathname.h index 7b5414d..a04c9e1 100644 --- a/lisp/pathname.h +++ b/lisp/pathname.h @@ -27,7 +27,7 @@ * Author: Paulo César Pereira de Andrade */ -/* $XFree86: xc/programs/xedit/lisp/pathname.h,v 1.5 2003/04/27 18:17:34 tsi Exp $ */ +/* $XFree86: xc/programs/xedit/lisp/pathname.h,v 1.4tsi Exp $ */ #ifndef Lisp_pathname_h #define Lisp_pathname_h |