xserver: Branch 'master'

[Aaron Plattner]

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

New commits:
commit 079625570d51e41569b73b2fd9237eb8f967f408
Author: Aaron Plattner <aplattner at nvidia.com>
Date:   Mon Sep 8 08:50:52 2008 -0700

    Bump ABI major versions for the TryClientExceptions change from commit 883811c.

diff --git a/hw/xfree86/common/xf86Module.h b/hw/xfree86/common/xf86Module.h
index 415d095..81011e1 100644
--- a/hw/xfree86/common/xf86Module.h
+++ b/hw/xfree86/common/xf86Module.h
@@ -82,9 +82,9 @@ typedef enum {
  * mask is 0xFFFF0000.
  */
 #define ABI_ANSIC_VERSION	SET_ABI_VERSION(0, 4)
-#define ABI_VIDEODRV_VERSION	SET_ABI_VERSION(4, 1)
-#define ABI_XINPUT_VERSION	SET_ABI_VERSION(3, 1)
-#define ABI_EXTENSION_VERSION	SET_ABI_VERSION(1, 1)
+#define ABI_VIDEODRV_VERSION	SET_ABI_VERSION(5, 0)
+#define ABI_XINPUT_VERSION	SET_ABI_VERSION(4, 0)
+#define ABI_EXTENSION_VERSION	SET_ABI_VERSION(2, 0)
 #define ABI_FONT_VERSION	SET_ABI_VERSION(0, 6)
 
 #define MODINFOSTRING1	0xef23fdc5