summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-03-05 13:38:14 +0000
committerEgbert Eich <eich@suse.de>2004-03-05 13:38:14 +0000
commitca2b905e73609219dee7df00a7751542a2c8d58a (patch)
tree9f9109aabc7ef26df93b884b2dbfd6a45b5cc8ba
parent16b7176600e8a415b22b327d0201759a1bdc9d70 (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).
-rw-r--r--gccmdep.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/gccmdep.cpp b/gccmdep.cpp
index 8f39d0d..ff4b12a 100644
--- a/gccmdep.cpp
+++ b/gccmdep.cpp
@@ -3,7 +3,7 @@ XCOMM!/bin/sh
XCOMM
XCOMM makedepend which uses 'gcc -M'
XCOMM
-XCOMM $XFree86: xc/config/util/gccmdep.cpp,v 3.11 2003/06/15 16:53:11 tsi Exp $
+XCOMM $XFree86: xc/config/util/gccmdep.cpp,v 3.10tsi Exp $
XCOMM
XCOMM Based on mdepend.cpp and code supplied by Hongjiu Lu <hjl@nynexst.com>
XCOMM