Index: ChangeLog
===================================================================
RCS file: /cvs/xorg/xc/ChangeLog,v
retrieving revision 1.365.2.138
diff -u -r1.365.2.138 ChangeLog
--- ChangeLog	25 Jan 2005 16:26:56 -0000	1.365.2.138
+++ ChangeLog	31 Jan 2005 23:28:53 -0000
@@ -1,3 +1,10 @@
+2005-01-31 Alexander Gottwald <ago@freedesktop.org>
+	* xc/config/cf/cygwin.cf
+	Bugzilla #1393 (https://bugs.freedesktop.org/show_bug.cgi?id=1393)
+	attachment #1188 (https://bugs.freedesktop.org/attachment.cgi?id=1188):
+	Move xorg version numbers to separate config file. The patch was 
+	approved but the changes were never commited to cygwin.cf.
+
 2005-01-25 Roland Mainz <roland.mainz@nrubsig.org>
 	* xc/config/cf/xorgversion.def
 	Bugzilla #2378 (https://bugs.freedesktop.org/show_bug.cgi?id=2378)
Index: config/cf/cygwin.cf
===================================================================
RCS file: /cvs/xorg/xc/config/cf/cygwin.cf,v
retrieving revision 1.14.2.2
diff -u -r1.14.2.2 cygwin.cf
--- config/cf/cygwin.cf	15 Dec 2004 04:53:05 -0000	1.14.2.2
+++ config/cf/cygwin.cf	31 Jan 2005 23:28:53 -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	1
+# define CygxVersionPatch	XORG_VERSION_PATCH
 #endif
 #ifndef CygxVersionSnap
-# define CygxVersionSnap	0
+# define CygxVersionSnap	XORG_VERSION_SNAP
 #endif
 #ifndef CygxVersionServer
 # define CygxVersionServer	0