summaryrefslogtreecommitdiff
path: root/xmodmap.h
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-03-04 17:49:16 +0000
committerEgbert Eich <eich@suse.de>2004-03-04 17:49:16 +0000
commit68c6af89e278502c853e74f1ff6c28af204960a4 (patch)
tree7a325c66e5e0f3230a32a1645e19c8167b4020e8 /xmodmap.h
parent158c5489e7371855683fd2f19f722316882627a7 (diff)
18. Merged in XFree86 code up to 4.4.0 including changes to files that hadXPRINT_BASEXORG-RELEASE-1-TM-MERGEXORG-RELEASE-1-TM-BASEIPv6-REVIEW-BASEIPv6-REVIEW
a changed license. There was only one change which happened to be from me (Egbert Eich).
Diffstat (limited to 'xmodmap.h')
-rw-r--r--xmodmap.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/xmodmap.h b/xmodmap.h
index 1a9a91c..0d2f779 100644
--- a/xmodmap.h
+++ b/xmodmap.h
@@ -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;