summaryrefslogtreecommitdiff
path: root/startx.cmd
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-03-05 13:41:28 +0000
committerEgbert Eich <eich@suse.de>2004-03-05 13:41:28 +0000
commit6f92cfa736b72aaedb8b76ec9f88ea959c740c48 (patch)
tree113a685e11dd8821160bbd5393cb8b3b2b7c4075 /startx.cmd
parentf8922707b115ee83db98a01f2287be16da4e1039 (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.cmd')
-rw-r--r--startx.cmd2
1 files changed, 1 insertions, 1 deletions
diff --git a/startx.cmd b/startx.cmd
index 4b4e712..fd19ef4 100644
--- a/startx.cmd
+++ b/startx.cmd
@@ -1,5 +1,5 @@
/* OS/2 REXX */
-/* $XFree86: xc/programs/xinit/startx.cmd,v 3.4 2003/11/12 00:10:31 dawes Exp $
+/* $XFree86: xc/programs/xinit/startx.cmd,v 3.3 1996/10/17 15:23:47 dawes Exp $
*
* This is just a sample implementation of a slightly less primitive
* interface than xinit. It looks for user xinitrc.cmd and xservrc.cmd