Merge branch 'master' into tablet-support

diff --cc configure.ac
Simple merge

diff --cc src/evdev-mt-touchpad.c
Simple merge

diff --cc src/evdev.c
Simple merge

diff --cc src/evdev.h
Simple merge

diff --cc src/libinput-private.h
Simple merge

diff --cc src/libinput-util.h
Simple merge

diff --cc src/libinput.c
Simple merge

diff --cc src/libinput.h
Simple merge

diff --cc test/Makefile.am
index fb8d5de,6a55c7f..f1330e7
--- 1/test/Makefile.am
--- 2/test/Makefile.am
+++ b/test/Makefile.am
@@@ -52,7 -49,7 +53,8 @@@ endi
  
  run_tests = \
        test-touchpad \
+       test-touchpad-tap \
 +      test-tablet \
        test-device \
        test-pointer \
        test-touch \

diff --cc test/device.c
Simple merge

diff --cc test/litest-int.h
Simple merge

diff --cc test/litest.c
Simple merge

diff --cc test/litest.h
index e23388c,b08ac40..50c24f1
--- 1/test/litest.h
--- 2/test/litest.h
+++ b/test/litest.h
@@@ -135,10 -136,7 +136,11 @@@ enum litest_device_type 
        LITEST_MOUSE_ROCCAT = -22,
        LITEST_LOGITECH_TRACKBALL = -23,
        LITEST_ATMEL_HOVER = -24,
-       LITEST_WACOM_BAMBOO = -25,
-       LITEST_WACOM_CINTIQ = -26,
-       LITEST_WACOM_INTUOS = -27,
-       LITEST_WACOM_ISDV4 = -28,
+       LITEST_ALPS_DUALPOINT = -25,
++      LITEST_WACOM_BAMBOO = -26,
++      LITEST_WACOM_CINTIQ = -27,
++      LITEST_WACOM_INTUOS = -28,
++      LITEST_WACOM_ISDV4 = -29,
  };
  
  enum litest_device_feature {

diff --cc test/misc.c
Simple merge

diff --cc tools/event-debug.c
Simple merge

diff --cc tools/event-gui.c
Simple merge