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

projects / platform / upstream / libinput.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: e32d94d 988f31f)

author	Peter Hutterer <peter.hutterer@who-t.net>
	Fri, 24 Jul 2015 00:56:05 +0000 (10:56 +1000)
committer	Peter Hutterer <peter.hutterer@who-t.net>
	Fri, 24 Jul 2015 00:56:05 +0000 (10:56 +1000)
commit	a7bd84a7eebe8838666a07a00f7cd8ebb9e5db98
tree	6d78ab6cc49f585949c6c2f7bf0d0f73785863cf	tree \| snapshot
parent	e32d94dc1b423493ff4207603adab9ecd3b886b1	commit \| diff
parent	988f31fc4a7a6c7d0b6e20f77ea7093afd0ef37a	commit \| diff

Merge branch 'master' into tablet-support

19 files changed:

configure.ac	diff1 \|	diff2 \|	blob \| history
doc/Makefile.am	diff1 \|	diff2 \|	blob \| history
src/evdev-mt-touchpad.c	diff1 \|	diff2 \|	blob \| history
src/evdev.c	diff1 \|	diff2 \|	blob \| history
src/evdev.h	diff1 \|	diff2 \|	blob \| history
src/libinput-private.h	diff1 \|	diff2 \|	blob \| history
src/libinput-util.h	diff1 \|	diff2 \|	blob \| history
src/libinput.c	diff1 \|	diff2 \|	blob \| history
src/libinput.h	diff1 \|	diff2 \|	blob \| history
src/libinput.sym	diff1 \|	diff2 \|	blob \| history
test/Makefile.am	diff1 \|	diff2 \|	blob \| history
test/device.c	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
test/pointer.c	diff1 \|	diff2 \|	blob \| history
tools/event-debug.c	diff1 \|	diff2 \|	blob \| history
tools/event-gui.c	diff1 \|	diff2 \|	blob \| history
tools/libinput-list-devices.c	diff1 \|	diff2 \|	blob \| history

Domain: Graphics System / Input Management;