[PULL] XI 2.2 and multitouch patches

[Peter Hutterer]

On Wed, Dec 21, 2011 at 09:48:05AM -0800, Keith Packard wrote:
> On Wed, 21 Dec 2011 16:04:28 +1000, Peter Hutterer <peter.hutterer at who-t.net> wrote:
> > Keith,
> > 
> > Please pull the XI 2.2 work into master. This bumps the input ABI to 15, but
> > I also hope that we don't need another bump this cycle. Carlos found the
> > one known outstanding active grab bug that has now been fixed.
> 
> Can you rebase these from master? They conflict with inpututils.c and
> configure.ac

Done, available on the multitouch branch. Both trivial conflicts.

commit e395efc25f9fd60377f32c2bf1a9153d70908236

Cheers,
  Peter
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: not available
URL: <http://lists.x.org/archives/xorg-devel/attachments/20111222/04b78c76/attachment.pgp>