diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:21 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:21 +0000 |
| commit | d3f968c3715f35df5cffb87c6b8b4227a1f4e11e (patch) | |
| tree | 544962a279a8f160b061bb337b3466c735bc13c0 | |
| parent | ac741e9ce533950de3b64ca7c9987e5c6f48434a (diff) | |
23. Merged with XFree86 4.4.0. Added changes that went into infected files.before_20040421_xprint_branch_landingXORG-CURRENT-premerge-release-1XORG-CURRENT-CLOSEDXACE-SELINUX-BASEDAMAGE-XFIXES-BASEXORG-CURRENTXACE-SELINUXDAMAGE-XFIXES
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).
| -rw-r--r-- | sessreg.c | 2 | ||||
| -rw-r--r-- | sessreg.man | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -30,7 +30,7 @@ * 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 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 |