xserver: Branch 'master'

[Peter Hutterer]

Apologies for not spotting this earlier.

On Mon, Sep 08, 2008 at 08:51:56AM -0700, Aaron Plattner wrote:
> 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.


> 
>  #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)

ABI_XINPUT_VERSION was bumped with the MPX merge, thus 3 is already the
correct version (server 1.5 has 2, btw.) Should we revert part of this patch?

Cheers,
  Peter