Index: xc/ChangeLog =================================================================== RCS file: /cvs/xorg/xc/ChangeLog,v retrieving revision 1.365.2.148 diff -u -2 -0 -r1.365.2.148 ChangeLog --- xc/ChangeLog 2 Feb 2005 03:38:05 -0000 1.365.2.148 +++ xc/ChangeLog 3 Feb 2005 00:20:59 -0000 @@ -1,20 +1,27 @@ +2005-02-02 Roland Mainz + * xc/config/cf/xorgversion.def + Bugzilla #2456 (https://bugs.freedesktop.org/show_bug.cgi?id=2456) + attachment #xxx (https://bugs.freedesktop.org/attachment.cgi?id=xxx): + Bump version number for upcoming X11R6.8.2rc4 (release canidate 4) to + X11R6.8.1.904. + 2005-02-01 Roland Mainz * xc/programs/Xserver/hw/xfree86/xf86config/xorgconfig.c Backout of Bugzilla #2206 (https://bugs.freedesktop.org/show_bug.cgi?id=2206) attachment #1622 (https://bugs.freedesktop.org/attachment.cgi?id=1622) as this patch does not work for the branch and causes build failure. Approved in the 2005-01-31 Xorg release-wranglers phone call. 2005-02-01 Roland Mainz * xc/programs/Xserver/hw/xfree86/drivers/sis/sis.h Bugzilla #2438 (https://bugs.freedesktop.org/show_bug.cgi?id=2438) attachment #1806 (https://bugs.freedesktop.org/attachment.cgi?id=1806): Fix sis driver to work correctly on AMD64. Patch by Thomas Winischhofer . Vouchers for commit into X11R6.8.x stable branch are Kevin E. Martin and Roland Mainz . 2005-02-01 Roland Mainz * xc/programs/Xserver/hw/xfree86/drivers/sis/init301.c Bugzilla #2437 (https://bugs.freedesktop.org/show_bug.cgi?id=2437) Index: xc/config/cf/xorgversion.def =================================================================== RCS file: /cvs/xorg/xc/config/cf/xorgversion.def,v retrieving revision 1.1.4.4 diff -u -2 -0 -r1.1.4.4 xorgversion.def --- xc/config/cf/xorgversion.def 25 Jan 2005 16:27:00 -0000 1.1.4.4 +++ xc/config/cf/xorgversion.def 3 Feb 2005 00:20:59 -0000 @@ -1,6 +1,6 @@ #define XORG_VERSION_MAJOR 6 #define XORG_VERSION_MINOR 8 #define XORG_VERSION_PATCH 1 -#define XORG_VERSION_SNAP 903 +#define XORG_VERSION_SNAP 904 -#define XORG_DATE "25 January 2005" +#define XORG_DATE "2 February 2005"