Merge branch 'wip/touchpad-drop-hysteresis'
authorPeter Hutterer <peter.hutterer@who-t.net>
Sun, 19 Jun 2016 23:26:44 +0000 (09:26 +1000)
committerPeter Hutterer <peter.hutterer@who-t.net>
Sun, 19 Jun 2016 23:26:44 +0000 (09:26 +1000)
1  2 
src/evdev.c
src/evdev.h
test/litest.c
test/litest.h
udev/90-libinput-model-quirks.hwdb

diff --cc src/evdev.c
@@@ -1804,9 -1804,7 +1804,8 @@@ evdev_read_model_flags(struct evdev_dev
                MODEL(CYBORG_RAT),
                MODEL(CYAPA),
                MODEL(LENOVO_T450_TOUCHPAD),
-               MODEL(PRECISE_TOUCHPAD),
                MODEL(TRACKBALL),
 +              MODEL(APPLE_MAGICMOUSE),
                { NULL, EVDEV_MODEL_DEFAULT },
  #undef MODEL
        };
diff --cc src/evdev.h
@@@ -114,9 -114,7 +114,8 @@@ enum evdev_device_model 
        EVDEV_MODEL_CYBORG_RAT = (1 << 14),
        EVDEV_MODEL_CYAPA = (1 << 15),
        EVDEV_MODEL_LENOVO_T450_TOUCHPAD= (1 << 17),
-       EVDEV_MODEL_PRECISE_TOUCHPAD = (1 << 18),
        EVDEV_MODEL_TRACKBALL = (1 << 19),
 +      EVDEV_MODEL_APPLE_MAGICMOUSE = (1 << 20),
  };
  
  struct mt_slot {
diff --cc test/litest.c
Simple merge
diff --cc test/litest.h
Simple merge
Simple merge