summaryrefslogtreecommitdiff
path: root/xdmcp.c
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-04-23 19:54:43 +0000
committerEgbert Eich <eich@suse.de>2004-04-23 19:54:43 +0000
commitec8b11f4b1ea888e28d71ee6f3903933d73aa65d (patch)
tree85c5433de8dca77ba65f1271a2f09a2fe1f9e341 /xdmcp.c
parent37f2b9991615b9f440c08c15457c54ee69f27f38 (diff)
Merging XORG-CURRENT into trunk
Diffstat (limited to 'xdmcp.c')
-rw-r--r--xdmcp.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/xdmcp.c b/xdmcp.c
index f64e172..ea273e4 100644
--- a/xdmcp.c
+++ b/xdmcp.c
@@ -1,3 +1,4 @@
+/* $XdotOrg: xc/programs/xdm/xdmcp.c,v 1.1.4.4 2003/12/06 13:24:29 kaleb Exp $ */
/* $Xorg: xdmcp.c,v 1.4 2001/02/09 02:05:41 xorgcvs Exp $ */
/*
@@ -26,7 +27,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/programs/xdm/xdmcp.c,v 3.26 2004/01/07 04:28:06 dawes Exp $ */
+/* $XFree86: xc/programs/xdm/xdmcp.c,v 3.25 2003/11/23 22:36:03 herrb Exp $ */
/*
* xdm - display manager daemon