From fb94573282c125d1d123a9f2e60b080447f6229a Mon Sep 17 00:00:00 2001
From: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Tue, 30 Mar 2004 11:25:45 +0000
Subject: Merge with XORG-RELEASE-1-TM (44-46)

---
 include/servermd.h | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/include/servermd.h b/include/servermd.h
index 72c48af..6e5cc8a 100644
--- a/include/servermd.h
+++ b/include/servermd.h
@@ -50,11 +50,15 @@ in this Software without prior written authorization from The Open Group.
 #define _SERVERMD_H_
 
 #ifndef VENDOR_RELEASE
-#define VENDOR_RELEASE 6600
+#define VENDOR_RELEASE 6700
 #endif
 
 #ifndef VENDOR_STRING
-#define VENDOR_STRING "The XFree86 Project (experimental version)"
+# if defined VENDORNAME
+#  define VENDOR_STRING VENDORNAME
+# else
+#  define VENDOR_STRING "X.Org Foundation"
+# endif
 #endif
 
 #ifndef DEFAULT_FS_PORT
-- 
cgit v1.2.3