# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1356079215 0
# Node ID 9eab99827fe66301cd294759353a91e0bddc901f
# Parent  4e805e1b2e7b46e5f8385c6047945a692367131c# Parent  b250930c7b6f3afbfbae06f7b4a348730f65e582
merge branches

diff -r 4e805e1b2e7b -r 9eab99827fe6 xorg-xf86-input-synaptics/stuff/35-synaptics.conf
--- a/xorg-xf86-input-synaptics/stuff/35-synaptics.conf	Fri Dec 21 08:37:05 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-Section "InputClass"
-	Identifier "touchpad"
-	Driver "synaptics"
-	MatchIsTouchpad "on"
-	Option "SHMConfig" "on"
-	Option "TapButton1" "1"
-	Option "TapButton2" "2"
-	Option "TapButton3" "3"
-	Option "VertEdgeScroll" "on"
-	Option "VertTwoFingerScroll" "on"
-	Option "HorizEdgeScroll" "on"
-	Option "HorizTwoFingerScroll" "on"
-	Option "CircularScrolling" "on"
-	Option "CircScrollTrigger" "2"
-	Option "EmulateTwoFingerMinZ" "0"
-EndSection
\ No newline at end of file
diff -r 4e805e1b2e7b -r 9eab99827fe6 xorg-xf86-input-synaptics/stuff/45-synaptics.conf
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/xorg-xf86-input-synaptics/stuff/45-synaptics.conf	Fri Dec 21 08:40:15 2012 +0000
@@ -0,0 +1,17 @@
+Section "InputClass"
+	Identifier "touchpad"
+	Driver "synaptics"
+	MatchIsTouchpad "on"
+	MatchDevicePath "/dev/input/event*"
+        Option "SHMConfig" "on"
+	Option "TapButton1" "1"
+	Option "TapButton2" "2"
+	Option "TapButton3" "3"
+	Option "VertEdgeScroll" "on"
+	Option "VertTwoFingerScroll" "on"
+	Option "HorizEdgeScroll" "on"
+	Option "HorizTwoFingerScroll" "on"
+	Option "CircularScrolling" "on"
+	Option "CircScrollTrigger" "2"
+	Option "EmulateTwoFingerMinZ" "0"
+EndSection
\ No newline at end of file