xserver: Branch 'master'

[Keith Packard]

 hw/xfree86/common/xf86Module.h |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 72a0754f4605493fd60471557422f88a97eb356a
Author: Aaron Plattner <aplattner at nvidia.com>
Date:   Wed Oct 29 19:19:18 2014 -0700

    xfree86: Bump ABI versions (video: 19, extension: 9)
    
    Among other things, commit b851ca968b7cce6d1a6438c05d3d5c8832249704 added a
    NameWindowPixmap function pointer to ScreenRec, shifting some of the fields
    around.
    
    Signed-off-by: Aaron Plattner <aplattner 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 b848f53..e68fe9c 100644
--- a/hw/xfree86/common/xf86Module.h
+++ b/hw/xfree86/common/xf86Module.h
@@ -80,9 +80,9 @@ typedef enum {
  * mask is 0xFFFF0000.
  */
 #define ABI_ANSIC_VERSION	SET_ABI_VERSION(0, 4)
-#define ABI_VIDEODRV_VERSION	SET_ABI_VERSION(18, 0)
+#define ABI_VIDEODRV_VERSION	SET_ABI_VERSION(19, 0)
 #define ABI_XINPUT_VERSION	SET_ABI_VERSION(21, 0)
-#define ABI_EXTENSION_VERSION	SET_ABI_VERSION(8, 0)
+#define ABI_EXTENSION_VERSION	SET_ABI_VERSION(9, 0)
 #define ABI_FONT_VERSION	SET_ABI_VERSION(0, 6)
 
 #define MODINFOSTRING1	0xef23fdc5