From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu, 22 Sep 2011 22:36:47 +0000 (+1000)
Subject: Merge branch 'smooth-scrolling'
X-Git-Url: https://diplodocus.org/git/xorg-xinput/commitdiff_plain/960ed57f624e200467d5b7801da0d11337d8eba4?ds=sidebyside;hp=-c

Merge branch 'smooth-scrolling'

Conflicts:
	src/test_xi2.c
---

960ed57f624e200467d5b7801da0d11337d8eba4