From 0bff33f78613ce0959a9bcb596c88c81a75d2317 Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.de>
Date: Fri, 2 Apr 2004 21:47:36 +0000
Subject: 70. Merging in the TM branch (Egbert Eich).

---
 include/servermd.h | 8 ++++++--
 xfs.def            | 2 +-
 2 files changed, 7 insertions(+), 3 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
diff --git a/xfs.def b/xfs.def
index f9040fd..0187d58 100644
--- a/xfs.def
+++ b/xfs.def
@@ -1,4 +1,4 @@
 NAME XFS NOTWINDOWCOMPAT
-DESCRIPTION "X11R6 XFree86 3.1.1 Font Server EMX 0.9A"
+DESCRIPTION "X11R6 3.1.1 Font Server EMX 0.9A"
 PROTMODE
 EXETYPE OS2
-- 
cgit v1.2.3