Merge branch 'ubuntu'
authorXavier Boudet <x-boudet@ti.com>
Fri, 30 Mar 2012 16:52:18 +0000 (16:52 +0000)
committerXavier Boudet <x-boudet@ti.com>
Fri, 30 Mar 2012 16:52:18 +0000 (16:52 +0000)
Conflicts:
debian/changelog
debian/patches/series

1  2 
debian/changelog
debian/control
debian/patches/series

Simple merge
diff --cc debian/control
Simple merge
index 3c3119f63fb6620787b13dd86cce678be3dd3133,50bfb358b99fe0fa2ebbe553818e5369062ec3ac..52d37335f2bcb35d429a98941e9a4fd6199f1147
@@@ -35,5 -34,5 +35,8 @@@
  500_pointer_barrier_thresholds.diff
  501_touch_accept_end.patch
  502_indirect_touch_window_set.patch
- 1001-xfree86-modes-Let-the-driver-handle-the-transform.patch
- 1002-xfree86-modes-Make-cursor-position-transform-a-helpe.patch
+ 503_fix_mouse_warp.patch
+ 504_implement_passive_touch_ungrab.patch
++#Rotation patches
++# 1001-xfree86-modes-Let-the-driver-handle-the-transform.patch
++# 1002-xfree86-modes-Make-cursor-position-transform-a-helpe.patch