]> diplodocus.org Git - xorg-xinput/commit
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)
commit960ed57f624e200467d5b7801da0d11337d8eba4
tree1dd8c7dcbffba61eb32e02b8ef70a15919bd5870
parentfa9fc75016e3587389040d6b91f03a3b80323a52
parent7bbf4624b8be1bcac7a782057b9c2db5e8bbcc75
Merge branch 'smooth-scrolling'

Conflicts:
src/test_xi2.c