]> diplodocus.org Git - xorg-xinput/commitdiff
Merge branch 'smooth-scrolling'
authorPeter Hutterer <peter.hutterer@who-t.net>
Thu, 22 Sep 2011 22:36:47 +0000 (08:36 +1000)
committerPeter Hutterer <peter.hutterer@who-t.net>
Thu, 22 Sep 2011 22:36:47 +0000 (08:36 +1000)
Conflicts:
src/test_xi2.c


No differences found