diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:28 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:28 +0000 |
| commit | 6f92cfa736b72aaedb8b76ec9f88ea959c740c48 (patch) | |
| tree | 113a685e11dd8821160bbd5393cb8b3b2b7c4075 /xinit.c | |
| parent | f8922707b115ee83db98a01f2287be16da4e1039 (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 'xinit.c')
| -rw-r--r-- | xinit.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -25,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/xinit/xinit.c,v 3.33 2003/06/10 17:03:56 dawes Exp $ */ +/* $XFree86: xc/programs/xinit/xinit.c,v 3.32 2002/05/31 18:46:13 dawes Exp $ */ #include <X11/Xlib.h> #include <X11/Xos.h> |