xserver: Branch 'master'

[Keith Packard]

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

New commits:
commit 902ff0b3497d202b86bf9a411e17db7b694d6eaa
Author: Adam Jackson <ajax at redhat.com>
Date:   Tue Oct 29 12:58:14 2013 -0400

    xfree86: Bump video/input/extension ABIs for 1.15
    
    Signed-off-by: Adam Jackson <ajax at redhat.com>
    Reviewed-by: Julien Cristau <jcristau at debian.org>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/hw/xfree86/common/xf86Module.h b/hw/xfree86/common/xf86Module.h
index e0cec05..265b553 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(14, 1)
-#define ABI_XINPUT_VERSION	SET_ABI_VERSION(19, 2)
-#define ABI_EXTENSION_VERSION	SET_ABI_VERSION(7, 0)
+#define ABI_VIDEODRV_VERSION	SET_ABI_VERSION(15, 0)
+#define ABI_XINPUT_VERSION	SET_ABI_VERSION(20, 0)
+#define ABI_EXTENSION_VERSION	SET_ABI_VERSION(8, 0)
 #define ABI_FONT_VERSION	SET_ABI_VERSION(0, 6)
 
 #define MODINFOSTRING1	0xef23fdc5