summaryrefslogtreecommitdiff
path: root/xdpyinfo.c
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-03-04 17:48:56 +0000
committerEgbert Eich <eich@suse.de>2004-03-04 17:48:56 +0000
commit9eaa510831e9bde0eb2b9582bb95be614a24ac12 (patch)
treef69508275cf532d568712aaf92913cd8abe6ce5f /xdpyinfo.c
parent0f493b8518a8a56b84e5412751841838f3e9f107 (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-BASE
a changed license. There was only one change which happened to be from me (Egbert Eich).
Diffstat (limited to 'xdpyinfo.c')
-rw-r--r--xdpyinfo.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/xdpyinfo.c b/xdpyinfo.c
index 33887ce..001cbd1 100644
--- a/xdpyinfo.c
+++ b/xdpyinfo.c
@@ -29,7 +29,7 @@ in this Software without prior written authorization from The Open Group.
* Author: Jim Fulton, MIT X Consortium
*/
-/* $XFree86: xc/programs/xdpyinfo/xdpyinfo.c,v 3.30 2003/11/17 22:20:51 dawes Exp $ */
+/* $XFree86: xc/programs/xdpyinfo/xdpyinfo.c,v 3.29 2003/04/14 20:38:10 herrb Exp $ */
#include <X11/Xlib.h>
#include <X11/Xutil.h>