Merge branch 'edge-scroll-on-edge-only'
authorPeter Hutterer <peter.hutterer@who-t.net>
Thu, 23 Jul 2015 04:50:03 +0000 (14:50 +1000)
committerPeter Hutterer <peter.hutterer@who-t.net>
Thu, 23 Jul 2015 04:50:06 +0000 (14:50 +1000)
1  2 
test/touchpad.c

diff --cc test/touchpad.c
Simple merge