[xorg-commit-diffs] xc/programs/xfs/include servermd.h, 1.1.4.2, 1.1.4.3

[Egbert Eich]

Committed by: eich

Update of /cvs/xorg/xc/programs/xfs/include
In directory pdx:/home/eich/tstbuild/xc/programs/xfs/include

Modified Files:
      Tag: XORG-CURRENT
	servermd.h 
Log Message:
2004-04-15  Egbert Eich  <eich at freedesktop.org>
        Merged changes from RELEASE-1 branch
	


Index: servermd.h
===================================================================
RCS file: /cvs/xorg/xc/programs/xfs/include/servermd.h,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- a/servermd.h	5 Mar 2004 13:41:26 -0000	1.1.4.2
+++ b/servermd.h	15 Apr 2004 10:17:42 -0000	1.1.4.3
@@ -50,11 +50,15 @@
 #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