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 | 4e28ae75ceb86e2e3b51125808cbeadc3dcaeb79 (patch) | |
| tree | b45ec16e84aeb04ee3a9042d872209f0258416db /streams.c | |
| parent | be98669d74b588aacf946cbf1c2d09421796d260 (diff) | |
23. Merged with XFree86 4.4.0. Added changes that went into infected files.XORG-CURRENT-premerge-release-1XACE-SELINUX-BASEDAMAGE-XFIXES-BASEDAMAGE-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).
Diffstat (limited to 'streams.c')
| -rw-r--r-- | streams.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/xdm/streams.c,v 3.8 2003/10/27 21:39:08 herrb Exp $ */ +/* $XFree86: xc/programs/xdm/streams.c,v 3.7 2003/07/09 15:27:39 tsi Exp $ */ /* * xdm - display manager daemon |