Merge branch 'master' into tablet-support
authorPeter Hutterer <peter.hutterer@who-t.net>
Tue, 16 Jun 2015 03:52:02 +0000 (13:52 +1000)
committerPeter Hutterer <peter.hutterer@who-t.net>
Tue, 16 Jun 2015 03:52:02 +0000 (13:52 +1000)
commit2b99363a1ff948917a1a81c18d6079fb4a8cd4c2
tree79bba625edcd0e82e30fa302475124d8bacee5ed
parent99aa1f5dc3593826e512460a5c914a87a3a7c16a
parent8025b374d564f4a30b089e5cf6fd65e0c6af8da2
Merge branch 'master' into tablet-support
src/evdev-mt-touchpad.c
src/evdev.c
src/evdev.h
src/libinput-util.h
test/Makefile.am
test/litest.c