Merge branch 'master' into tablet-support
authorPeter Hutterer <peter.hutterer@who-t.net>
Mon, 29 Jun 2015 03:56:05 +0000 (13:56 +1000)
committerPeter Hutterer <peter.hutterer@who-t.net>
Mon, 29 Jun 2015 03:56:05 +0000 (13:56 +1000)
commit9610ff849e6a3fbd95a52f7c6c045901046a1f60
tree741f9e3bcf8f398801b2eacc6be3c969d7764012
parent0d322c69d0df0b262dbd3a6a0427bde0a596dfb2
parentb344e3e56646ecea29f3930d88b57babea358db2
Merge branch 'master' into tablet-support
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/litest.h
tools/event-debug.c
tools/event-gui.c