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 /startx.cpp | |
| 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 'startx.cpp')
| -rw-r--r-- | startx.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -11,7 +11,7 @@ XCOMM and pop a clock and serveral xterms. XCOMM XCOMM Site administrators are STRONGLY urged to write nicer versions. XCOMM -XCOMM $XFree86: xc/programs/xinit/startx.cpp,v 3.18 2003/08/22 19:27:33 eich Exp $ +XCOMM $XFree86: xc/programs/xinit/startx.cpp,v 3.16tsi Exp $ #ifdef SCO |