xserver: Branch 'master' - 2 commits

[Keith Packard]

 configure.ac                   |    4 ++--
 hw/xfree86/common/xf86Module.h |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 14983286c489ea1ec6ba4fadbeaec5c2d2ee34e1
Author: Keith Packard <keithp at keithp.com>
Date:   Mon Dec 6 20:45:35 2010 -0800

    Version bumped to 1.9.99.901 (1.10 RC1)
    
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/configure.ac b/configure.ac
index d1fc379..b56d3e8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,8 +26,8 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ(2.57)
-AC_INIT([xorg-server], 1.9.99.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE="2010-10-01"
+AC_INIT([xorg-server], 1.9.99.901, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE="2010-12-06"
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
commit d96d5f5443358e33e47d1a61f9bd2afd8064a8dd
Author: James Jones <jajones at nvidia.com>
Date:   Sun Dec 5 19:42:41 2010 -0800

    Bump extension ABI to 5
    
    Commit 606e079cc4d9a9db3197652ca51683c36f74efb8 moved the visual
    field in WindowOptRec, breaking the extension module ABI.
    
    Signed-off-by: James Jones <jajones at nvidia.com>
    Reviewed-by: Keith Packard <keithp at keithp.com>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/hw/xfree86/common/xf86Module.h b/hw/xfree86/common/xf86Module.h
index 72f6cf0..af7b778 100644
--- a/hw/xfree86/common/xf86Module.h
+++ b/hw/xfree86/common/xf86Module.h
@@ -84,7 +84,7 @@ typedef enum {
 #define ABI_ANSIC_VERSION	SET_ABI_VERSION(0, 4)
 #define ABI_VIDEODRV_VERSION	SET_ABI_VERSION(9, 0)
 #define ABI_XINPUT_VERSION	SET_ABI_VERSION(12, 0)
-#define ABI_EXTENSION_VERSION	SET_ABI_VERSION(4, 0)
+#define ABI_EXTENSION_VERSION	SET_ABI_VERSION(5, 0)
 #define ABI_FONT_VERSION	SET_ABI_VERSION(0, 6)
 
 #define MODINFOSTRING1	0xef23fdc5