diff options
author | Egbert Eich <eich@suse.de> | 2004-04-02 21:47:36 +0000 |
---|---|---|
committer | Egbert Eich <eich@suse.de> | 2004-04-02 21:47:36 +0000 |
commit | 0bff33f78613ce0959a9bcb596c88c81a75d2317 (patch) | |
tree | 5ebde5dfa009befb22ea1e2b66db8c24553bb44f | |
parent | c7db8fc8bea71cb7e57041a0bb0a37390f6d1880 (diff) |
70. Merging in the TM branch (Egbert Eich).xo-6_7_0XORG-RELEASE-1-STSF-FORKXORG-RELEASE-1-MERGEXORG-CYGWIN-MERGEXORG-CYGWIN-LAST-MERGEXORG-6_7_0XORG-RELEASE-1-STSFXORG-RELEASE-1
-rw-r--r-- | include/servermd.h | 8 | ||||
-rw-r--r-- | 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 @@ -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 |