xserver: Branch 'master'

[Keith Packard]

 hw/xfree86/common/xf86Module.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3e091e1075dc29120e54ab2ef110b04ce7383ffd
Author: Aaron Plattner <aplattner at nvidia.com>
Date:   Fri Aug 17 11:26:05 2012 -0700

    xfree86: Bump extension ABI to 7.0
    
    Commit 9d457f9c55f12106ba44c1c9db59d14f978f0ae8 added an array of
    DevPrivateSetRec structures in the middle of the ScreenRec, which throws off
    extension modules trying to call things like pScreen->DestroyPixmap.
    
    Signed-off-by: Aaron Plattner <aplattner at nvidia.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 d93405e..83f9790 100644
--- a/hw/xfree86/common/xf86Module.h
+++ b/hw/xfree86/common/xf86Module.h
@@ -82,7 +82,7 @@ typedef enum {
 #define ABI_ANSIC_VERSION	SET_ABI_VERSION(0, 4)
 #define ABI_VIDEODRV_VERSION	SET_ABI_VERSION(13, 0)
 #define ABI_XINPUT_VERSION	SET_ABI_VERSION(18, 0)
-#define ABI_EXTENSION_VERSION	SET_ABI_VERSION(6, 0)
+#define ABI_EXTENSION_VERSION	SET_ABI_VERSION(7, 0)
 #define ABI_FONT_VERSION	SET_ABI_VERSION(0, 6)
 
 #define MODINFOSTRING1	0xef23fdc5