summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland Mainz <roland.mainz@nrubsig.org>2004-04-10 09:05:50 +0000
committerRoland Mainz <roland.mainz@nrubsig.org>2004-04-10 09:05:50 +0000
commit2bc1b0c21f88e55c1cbf747be945f2557eae737c (patch)
tree5ebde5dfa009befb22ea1e2b66db8c24553bb44f
parentc7db8fc8bea71cb7e57041a0bb0a37390f6d1880 (diff)
Resync to 2004-04-10 XORG-RELEASE-1 branchXPRINT_BEGINXPRINT
-rw-r--r--include/servermd.h8
-rw-r--r--xfs.def2
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