From d3f968c3715f35df5cffb87c6b8b4227a1f4e11e Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Fri, 5 Mar 2004 13:41:21 +0000 Subject: 23. Merged with XFree86 4.4.0. Added changes that went into infected files. 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). --- sessreg.c | 2 +- sessreg.man | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sessreg.c b/sessreg.c index 2375e80..6b04ba0 100644 --- a/sessreg.c +++ b/sessreg.c @@ -30,7 +30,7 @@ * by Andreas Stolcke */ -/* $XFree86: xc/programs/xdm/sessreg.c,v 3.19 2002/12/07 20:31:04 herrb Exp $ */ +/* $XFree86: xc/programs/xdm/sessreg.c,v 3.18 2001/12/14 20:01:24 dawes Exp $ */ /* * sessreg diff --git a/sessreg.man b/sessreg.man index 7057596..ca65fd1 100644 --- a/sessreg.man +++ b/sessreg.man @@ -23,7 +23,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86: xc/programs/xdm/sessreg.man,v 1.8 2001/12/14 20:01:24 dawes Exp $ +.\" $XFree86: xc/programs/xdm/sessreg.man,v 1.7 2001/04/23 20:31:09 dawes Exp $ .\" .TH SESSREG 1 __xorgversion__ .SH NAME -- cgit v1.2.3