Merge branch 'wip/custom-pointer-acceleration-function-v2'
authorPeter Hutterer <peter.hutterer@who-t.net>
Wed, 2 May 2018 00:53:08 +0000 (10:53 +1000)
committerPeter Hutterer <peter.hutterer@who-t.net>
Wed, 2 May 2018 00:53:08 +0000 (10:53 +1000)
1  2 
src/evdev-mt-touchpad.c
src/evdev.c
src/libinput.c
src/libinput.h
src/libinput.sym
test/test-misc.c

Simple merge
diff --cc src/evdev.c
Simple merge
diff --cc src/libinput.c
Simple merge
diff --cc src/libinput.h
Simple merge
index aa2794e99187a865f58336b4f52b2044541b68a2,f40969bf7a7c79e5421cca5f0fe9eba767db7330..f991aeead46e150bc90e263c29a9b42c4e05614a
@@@ -295,5 -295,5 +295,6 @@@ LIBINPUT_1.9 
  } LIBINPUT_1.7;
  
  LIBINPUT_1.11 {
+       libinput_device_config_accel_set_curve_point;
 +      libinput_device_touch_get_touch_count;
  } LIBINPUT_1.9;
Simple merge