Merge branch 'ubuntu'
authorXavier Boudet <x-boudet@ti.com>
Wed, 4 Apr 2012 12:14:00 +0000 (12:14 +0000)
committerXavier Boudet <x-boudet@ti.com>
Wed, 4 Apr 2012 12:14:00 +0000 (12:14 +0000)
Conflicts:
debian/changelog
debian/patches/series

1  2 
debian/changelog
debian/patches/series

Simple merge
index c10c93d0dbf931accb47c0d9d0b81c85651db07a,120a81a351b4d83ef751bd2e039be417c15b8e4f..69f1a8dfc0614fa3ba2c8dbed150442fed4342ae
@@@ -37,6 -36,4 +37,7 @@@
  502_indirect_touch_window_set.patch
  503_fix_mouse_warp.patch
  504_implement_passive_touch_ungrab.patch
+ 505_query_pointer_touchscreen.patch
 +#Rotation patches
 +1001-xfree86-modes-Let-the-driver-handle-the-transform.patch
 +1002-xfree86-modes-Make-cursor-position-transform-a-helpe.patch