summaryrefslogtreecommitdiff
path: root/main.c
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-03-05 13:38:13 +0000
committerEgbert Eich <eich@suse.de>2004-03-05 13:38:13 +0000
commitcf0f34454efeafb21631f2e5e36709af61018de2 (patch)
tree5be7432cd02d0df4a77579bd53827acba9ead3ef /main.c
parentdd03dddbfc957f65e049d12180ec38940c278d37 (diff)
23. Merged with XFree86 4.4.0. Added changes that went into infected files.XACE-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 'main.c')
-rw-r--r--main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/main.c b/main.c
index 5a95943..1811bcd 100644
--- a/main.c
+++ b/main.c
@@ -24,7 +24,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/config/makedepend/main.c,v 3.32 2003/03/26 20:43:48 tsi Exp $ */
+/* $XFree86: xc/config/makedepend/main.c,v 3.31tsi Exp $ */
#include "def.h"
#ifdef hpux