Merge branch 'ubuntu'
authorXavier Boudet <x-boudet@ti.com>
Wed, 2 May 2012 08:57:24 +0000 (08:57 +0000)
committerXavier Boudet <x-boudet@ti.com>
Wed, 2 May 2012 08:57:24 +0000 (08:57 +0000)
Conflicts:
debian/changelog
debian/patches/series

1  2 
debian/changelog
debian/patches/series

Simple merge
index 125c06b96cfcd6e9b8a640f8beb0a413b4e333c4,f17f72626e52b41cfb7442fbbffb99ad8ac07f6f..6af5ed7d21c558bea2741cb4ae846bcda5515eb5
  
  # Temporary, until it's reviewed & accepted upstream
  500_pointer_barrier_thresholds.diff
- 501_touch_accept_end.patch
- 502_indirect_touch_window_set.patch
- 503_fix_mouse_warp.patch
- 504_implement_passive_touch_ungrab.patch
  505_query_pointer_touchscreen.patch
  506_touchscreen_pointer_emulation_checks.patch
+ 507_touchscreen_fixes.patch
++
 +#Rotation patches
 +1001-xfree86-modes-Let-the-driver-handle-the-transform.patch
 +1002-xfree86-modes-Make-cursor-position-transform-a-helpe.patch