summaryrefslogtreecommitdiff
path: root/exec.c
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 /exec.c
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 'exec.c')
-rw-r--r--exec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/exec.c b/exec.c
index cc105a8..4c77e35 100644
--- a/exec.c
+++ b/exec.c
@@ -57,7 +57,7 @@ from The Open Group.
* Author: Jim Fulton, MIT X Consortium; derived from parts of the
* original xmodmap, written by David Rosenthal, of Sun Microsystems.
*/
-/* $XFree86: xc/programs/xmodmap/exec.c,v 1.6 2003/12/02 13:13:57 pascal Exp $ */
+/* $XFree86: xc/programs/xmodmap/exec.c,v 1.5 2001/12/14 20:02:13 dawes Exp $ */
#include <X11/Xos.h>
#include <X11/Xlib.h>