summaryrefslogtreecommitdiff
path: root/protodpy.c
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-03-05 13:41:21 +0000
committerEgbert Eich <eich@suse.de>2004-03-05 13:41:21 +0000
commit4e28ae75ceb86e2e3b51125808cbeadc3dcaeb79 (patch)
treeb45ec16e84aeb04ee3a9042d872209f0258416db /protodpy.c
parentbe98669d74b588aacf946cbf1c2d09421796d260 (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 'protodpy.c')
-rw-r--r--protodpy.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/protodpy.c b/protodpy.c
index 47c25e4..d2df151 100644
--- a/protodpy.c
+++ b/protodpy.c
@@ -25,7 +25,7 @@ in this Software without prior written authorization from The Open Group.
*
* Author: Keith Packard, MIT X Consortium
*/
-/* $XFree86: xc/programs/xdm/protodpy.c,v 1.5 2001/12/14 20:01:23 dawes Exp $ */
+/* $XFree86: xc/programs/xdm/protodpy.c,v 1.4 2001/07/25 15:05:19 dawes Exp $ */
/*
* protodpy.c