Merge branch 'ref-counting-context'
authorPeter Hutterer <peter.hutterer@who-t.net>
Wed, 25 Jun 2014 00:32:42 +0000 (10:32 +1000)
committerPeter Hutterer <peter.hutterer@who-t.net>
Wed, 25 Jun 2014 00:32:42 +0000 (10:32 +1000)
commitbad56cac5b17c3eda58facfc87ae6345814ddc16
treea375bfb5e5a42bf40d5b3d9a967c3b09d940158d
parent97a6bf10f95859940379787da2635b69399db40c
parent89aa3ca176130104f2fc5c034400cbb4c41cf479
Merge branch 'ref-counting-context'

Conflicts:
src/udev-seat.c
test/log.c
src/libinput-private.h
src/libinput.c
src/libinput.h
src/udev-seat.c
test/keyboard.c
test/litest.c
test/log.c
test/udev.c
tools/event-debug.c
tools/event-gui.c