Commit d3f968c3 authored by Egbert Eich's avatar Egbert Eich

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).
parent ac741e9c
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
* by Andreas Stolcke <stolcke@icsi.berkeley.edu> * by Andreas Stolcke <stolcke@icsi.berkeley.edu>
*/ */
/* $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 * sessreg
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
.\" other dealings in this Software without prior written authorization .\" other dealings in this Software without prior written authorization
.\" from The Open Group. .\" 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__ .TH SESSREG 1 __xorgversion__
.SH NAME .SH NAME
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment