Merge branch 'master' into tablet-support
authorPeter Hutterer <peter.hutterer@who-t.net>
Tue, 4 Aug 2015 02:32:00 +0000 (12:32 +1000)
committerPeter Hutterer <peter.hutterer@who-t.net>
Tue, 4 Aug 2015 02:32:00 +0000 (12:32 +1000)
commit6bfc36f9cfc0ed39b581fdea2761008d3c40d3a5
tree64ef27610c41a8a35b01c4f5123d5611eb0e0c75
parenta7bd84a7eebe8838666a07a00f7cd8ebb9e5db98
parent603ac39e3b76fff453410995d7f11c9ace504ec6
Merge branch 'master' into tablet-support
15 files changed:
configure.ac
doc/Makefile.am
src/evdev-mt-touchpad.c
src/evdev.c
src/evdev.h
src/libinput-private.h
src/libinput-util.h
src/libinput.c
src/libinput.h
src/libinput.sym
test/Makefile.am
test/litest.c
test/litest.h
test/misc.c
test/pointer.c