Merge branch 'master' of git+ssh://git.freedesktop.org/git/wayland/libinput
authorPeter Hutterer <peter.hutterer@who-t.net>
Wed, 25 Jun 2014 03:37:02 +0000 (13:37 +1000)
committerPeter Hutterer <peter.hutterer@who-t.net>
Wed, 25 Jun 2014 03:37:02 +0000 (13:37 +1000)
1  2 
tools/event-gui.c

Simple merge