review.tizen.org Git - platform/upstream/libinput.git/commit

projects / platform / upstream / libinput.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: bfce05d 8658ff1)

author	Peter Hutterer <peter.hutterer@who-t.net>
	Tue, 14 Jul 2015 03:13:11 +0000 (13:13 +1000)
committer	Peter Hutterer <peter.hutterer@who-t.net>
	Tue, 14 Jul 2015 03:13:11 +0000 (13:13 +1000)
commit	9e705bf33400a6cc3ccd0fa0fc80c243a7aeb3b4
tree	7a381c7c2063e978821f7849e604b54d9528e0d9	tree \| snapshot
parent	bfce05db05265a7ebac5d050a8ff1beb7e81543d	commit \| diff
parent	8658ff159d416b6a567acb2aaf72b27887ad8576	commit \| diff

Merge branch 'master' into tablet-support

15 files changed:

configure.ac	diff1 \|	diff2 \|	blob \| history
src/evdev-mt-touchpad.c	diff1 \|	diff2 \|	blob \| history
src/evdev.c	diff1 \|	diff2 \|	blob \| history
src/libinput-util.h	diff1 \|	diff2 \|	blob \| history
test/Makefile.am	diff1 \|	diff2 \|	blob \| history
test/device.c	diff1 \|	diff2 \|	blob \| history
test/litest-device-wacom-bamboo-tablet.c	diff1 \|	\|	blob \| history
test/litest-device-wacom-cintiq-tablet.c	diff1 \|	\|	blob \| history
test/litest-device-wacom-intuos-tablet.c	diff1 \|	\|	blob \| history
test/litest-device-wacom-isdv4-tablet.c	diff1 \|	\|	blob \| history
test/litest-device-waltop-tablet.c	diff1 \|	\|	blob \| history
test/litest-int.h	diff1 \|	diff2 \|	blob \| history
test/litest.c	diff1 \|	diff2 \|	blob \| history
test/litest.h	diff1 \|	diff2 \|	blob \| history
test/misc.c	diff1 \|	diff2 \|	blob \| history

Domain: Graphics System / Input Management;