[PULL] XI 2.2 and multitouch patches

[Keith Packard]

On Thu, 22 Dec 2011 09:36:30 +1000, Peter Hutterer <peter.hutterer at who-t.net> wrote:

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

Thanks!

I had to patch up test_convert_XITouchOwnerShipEvent to not
infinite-loop in 32-bit mode, that commit is on top of your branch;
bisecting through that will fail 'make check', but should otherwise work
fine.

Merged.
   fcda98c..e7df42a  master -> master

-- 
keith.packard at intel.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 827 bytes
Desc: not available
URL: <http://lists.x.org/archives/xorg-devel/attachments/20111222/7859978c/attachment-0001.pgp>