xf86-input-evdev: Changes to 'master'

[Peter Hutterer]

 src/evdev.c |   17 ++++++++++++++++-
 src/evdev.h |    4 ++++
 2 files changed, 20 insertions(+), 1 deletion(-)

New commits:
commit 745fca03a20117583bc18c7134583311ff52c29c
Merge: eede8ccffc1a831f4de89403edc8dffd52494e8b b450efdf95999cad08de23ce069f04a66bdae24b
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Wed Nov 9 16:01:48 2011 +1000

    Merge branch 'smooth-scrolling'
    
    Conflicts:
    	src/evdev.c
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

commit b450efdf95999cad08de23ce069f04a66bdae24b
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Fri Aug 19 11:15:09 2011 +1000

    Support smooth scrolling on REL_WHEEL, REL_HWHEEL and REL_DIAL
    
    Automatic smooth scrolling setup for these axes, with REL_WHEEL and REL_DIAL
    both mapping into vscrolling. REL_WHEEL is the preferred axis.
    
    Mouse wheel emulation is not yet updated for smooth scrolling.
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
    Reviewed-by: Daniel Stone <daniel at fooishbar.org>