Index: xorg.cf
===================================================================
RCS file: /cvs/xorg/xc/config/cf/xorg.cf,v
retrieving revision 1.27
diff -u -r1.27 xorg.cf
--- xorg.cf	3 Sep 2004 22:00:10 -0000	1.27
+++ xorg.cf	15 Sep 2004 18:14:44 -0000
@@ -11,13 +11,7 @@
 /* Get and set version information. */
 
 #include "date.def"
-
-#define XORG_VERSION_MAJOR  6
-#define XORG_VERSION_MINOR  8
-#define XORG_VERSION_PATCH  0
-#define XORG_VERSION_SNAP   0
-
-#define XORG_DATE "8 September 2004"
+#include "xorgversion.def"
 
 #if !defined(XorgVersionString) && \
     defined(XORG_VERSION_MAJOR) && defined(XORG_VERSION_MINOR) && \
Index: cygwin.cf
===================================================================
RCS file: /cvs/xorg/xc/config/cf/cygwin.cf,v
retrieving revision 1.14
diff -u -r1.14 cygwin.cf
--- cygwin.cf	3 Sep 2004 16:18:18 -0000	1.14
+++ cygwin.cf	15 Sep 2004 18:14:44 -0000
@@ -1,15 +1,17 @@
 /* Cygwin/X vendor strings and version */
+#include "xorgversion.def"
+
 #ifndef CygxVersionMajor
-# define CygxVersionMajor	6
+# define CygxVersionMajor	XORG_VERSION_MAJOR
 #endif
 #ifndef CygxVersionMinor
-# define CygxVersionMinor	8
+# define CygxVersionMinor	XORG_VERSION_MINOR
 #endif
 #ifndef CygxVersionPatch
-# define CygxVersionPatch	0
+# define CygxVersionPatch	XORG_VERSION_PATCH
 #endif
 #ifndef CygxVersionSnap
-# define CygxVersionSnap	0
+# define CygxVersionSnap	XORG_VERSION_SNAP
 #endif
 #ifndef CygxVersionServer
 # define CygxVersionServer	0