wok rev 13724

merge branches
author Aleksej Bobylev <al.bobylev@gmail.com>
date Fri Dec 21 08:40:15 2012 +0000 (2012-12-21)
parents 4e805e1b2e7b b250930c7b6f
children 77850ece4ff6
files xorg-xf86-input-synaptics/stuff/35-synaptics.conf
line diff
     1.1 --- a/xorg-xf86-input-synaptics/stuff/35-synaptics.conf	Fri Dec 21 08:37:05 2012 +0000
     1.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.3 @@ -1,16 +0,0 @@
     1.4 -Section "InputClass"
     1.5 -	Identifier "touchpad"
     1.6 -	Driver "synaptics"
     1.7 -	MatchIsTouchpad "on"
     1.8 -	Option "SHMConfig" "on"
     1.9 -	Option "TapButton1" "1"
    1.10 -	Option "TapButton2" "2"
    1.11 -	Option "TapButton3" "3"
    1.12 -	Option "VertEdgeScroll" "on"
    1.13 -	Option "VertTwoFingerScroll" "on"
    1.14 -	Option "HorizEdgeScroll" "on"
    1.15 -	Option "HorizTwoFingerScroll" "on"
    1.16 -	Option "CircularScrolling" "on"
    1.17 -	Option "CircScrollTrigger" "2"
    1.18 -	Option "EmulateTwoFingerMinZ" "0"
    1.19 -EndSection
    1.20 \ No newline at end of file
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/xorg-xf86-input-synaptics/stuff/45-synaptics.conf	Fri Dec 21 08:40:15 2012 +0000
     2.3 @@ -0,0 +1,17 @@
     2.4 +Section "InputClass"
     2.5 +	Identifier "touchpad"
     2.6 +	Driver "synaptics"
     2.7 +	MatchIsTouchpad "on"
     2.8 +	MatchDevicePath "/dev/input/event*"
     2.9 +        Option "SHMConfig" "on"
    2.10 +	Option "TapButton1" "1"
    2.11 +	Option "TapButton2" "2"
    2.12 +	Option "TapButton3" "3"
    2.13 +	Option "VertEdgeScroll" "on"
    2.14 +	Option "VertTwoFingerScroll" "on"
    2.15 +	Option "HorizEdgeScroll" "on"
    2.16 +	Option "HorizTwoFingerScroll" "on"
    2.17 +	Option "CircularScrolling" "on"
    2.18 +	Option "CircScrollTrigger" "2"
    2.19 +	Option "EmulateTwoFingerMinZ" "0"
    2.20 +EndSection
    2.21 \ No newline at end of file