diff options
| author | Egbert Eich <eich@suse.de> | 2004-04-15 10:17:42 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-04-15 10:17:42 +0000 |
| commit | 993c7446a8c253df9e437b9c301dc25fe4fdea56 (patch) | |
| tree | 9677da566d4ee10e981676bd628fe448c5c5af70 | |
| parent | a79af8ea92fdbe4cd3a5a75c4f3132b7268c35fa (diff) | |
Merged changes from RELEASE-1 branchbefore_20040421_xprint_branch_landingXORG-CURRENT-CLOSEDXORG-CURRENT
| -rw-r--r-- | difs/fonts.c | 1 | ||||
| -rw-r--r-- | include/servermd.h | 8 | ||||
| -rw-r--r-- | xfs.def | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/difs/fonts.c b/difs/fonts.c index 1b3dcc2..bbe8964 100644 --- a/difs/fonts.c +++ b/difs/fonts.c @@ -46,7 +46,6 @@ in this Software without prior written authorization from The Open Group. * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/programs/xfs/difs/fonts.c,v 3.13 2001/12/14 20:01:34 dawes Exp $ */ /*#define DEBUG*/ #include "FS.h" #include "FSproto.h" 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 |