summaryrefslogtreecommitdiff
path: root/mach.cf
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-04-23 18:41:59 +0000
committerEgbert Eich <eich@suse.de>2004-04-23 18:41:59 +0000
commita3ff52d12aa7d5f4e5a138bc7c62b5f44d29e8b4 (patch)
tree426983a93684c4294c555d7c987fd200bbc6c23d /mach.cf
parent2ca96d133adb9063b728d9b70827ba8c750e209a (diff)
Merging XORG-CURRENT into trunk
Diffstat (limited to 'mach.cf')
-rw-r--r--mach.cf4
1 files changed, 2 insertions, 2 deletions
diff --git a/mach.cf b/mach.cf
index 4489ee6..c2047a3 100644
--- a/mach.cf
+++ b/mach.cf
@@ -2,7 +2,7 @@ XCOMM $Xorg: mach.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $
-XCOMM platform: $XFree86: xc/config/cf/mach.cf,v 3.13 2001/04/19 19:54:43 dawes Exp $
+XCOMM platform: $XFree86: xc/config/cf/mach.cf,v 3.12 2001/01/17 16:22:32 dawes Exp $
#define OSName Mach 2.5/3.0
#define OSVendor /**/
@@ -68,5 +68,5 @@ XCOMM operating system: OSName
#endif
#ifdef i386Architecture
-# include <xfree86.cf>
+# include <xorg.cf>
#endif