Merge branch 'master' into tablet-support
authorPeter Hutterer <peter.hutterer@who-t.net>
Tue, 19 Jan 2016 02:02:51 +0000 (12:02 +1000)
committerPeter Hutterer <peter.hutterer@who-t.net>
Tue, 19 Jan 2016 02:02:51 +0000 (12:02 +1000)
commit91a568d1a1339829f4e3969bde3a4935fef9542b
treed87be87b2199ea489f922f06eb1e538e196ffdff
parentf5200c532527644d7a32da6149bb7edb5d8fc9b1
parent999cbc8933c6b01d5045afed8203aeba7dfdcb6f
Merge branch 'master' into tablet-support
12 files changed:
configure.ac
src/evdev-mt-touchpad.c
src/evdev.c
src/evdev.h
src/libinput-util.h
src/libinput.h
test/Makefile.am
test/device.c
test/litest.c
test/litest.h
test/misc.c
tools/event-debug.c