summaryrefslogtreecommitdiff
path: root/xfree86.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 /xfree86.cf
parent2ca96d133adb9063b728d9b70827ba8c750e209a (diff)
Merging XORG-CURRENT into trunk
Diffstat (limited to 'xfree86.cf')
-rw-r--r--xfree86.cf4
1 files changed, 2 insertions, 2 deletions
diff --git a/xfree86.cf b/xfree86.cf
index c6af215..1891043 100644
--- a/xfree86.cf
+++ b/xfree86.cf
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/config/cf/xfree86.cf,v 3.467 2004/01/28 01:47:26 dawes Exp $
+XCOMM $XFree86: xc/config/cf/xfree86.cf,v 3.466 2004/01/11 18:48:11 dawes Exp $
/*
* This configuration file contains all of the configuration
* information for the XFree86 based X Servers.
@@ -85,7 +85,7 @@ XCOMM $Xorg: xfree86.cf,v 1.4 2000/08/17 19:41:49 cpqbld Exp $
#endif
#ifndef XVendorString
-# define XVendorString "The XFree86 Project, Inc"
+# define XVendorString "The X.Org Foundation, Inc"
#endif
#ifndef XVendorRelease