diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:37 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:37 +0000 |
| commit | fb62b8a736dd3c97203f9a5da9546193f39af3c7 (patch) | |
| tree | 7a325c66e5e0f3230a32a1645e19c8167b4020e8 /xmodmap.h | |
| parent | 158c5489e7371855683fd2f19f722316882627a7 (diff) | |
23. Merged with XFree86 4.4.0. Added changes that went into infected files.XORG-CURRENT-premerge-release-1XACE-SELINUX-BASEDAMAGE-XFIXES-BASEDAMAGE-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 'xmodmap.h')
| -rw-r--r-- | xmodmap.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/xmodmap/xmodmap.h,v 1.5 2001/12/14 20:02:13 dawes Exp $ */ +/* $XFree86: xc/programs/xmodmap/xmodmap.h,v 1.4 2001/01/17 23:46:21 dawes Exp $ */ extern char *ProgramName; extern Display *dpy; |