Merge lp:~jderose/ubuntu/saucy/ubuntu-settings/2finger into lp:ubuntu/saucy/ubuntu-settings

[Jason Gerard DeRose]

Enable two-finger scrolling by default!

More words that you could have possibly wanted to justify it:
https://bugs.launchpad.net/ubuntu/+source/ubuntu-settings/+bug/1217166

[Jeremy Bícha (jbicha)]

Thanks!

review: Approve

[Jason Gerard DeRose (jderose)]

Thanks for the review, Jeremy!

=== modified file 'debian/changelog'
--- debian/changelog	2013-08-26 08:45:47 +0000
+++ debian/changelog	2013-08-27 02:34:30 +0000
@@ -1,3 +1,9 @@
+ubuntu-settings (13.10.3) saucy; urgency=low
+
+  * Enable two-finger scrolling by default (LP: #1217166)
+
+ -- Jason Gerard DeRose <[e-mail]>  Mon, 26 Aug 2013 20:27:25 -0600
+
 ubuntu-settings (13.10.2) saucy; urgency=low
 
   * debian/10-ubuntu.conf:

=== modified file 'debian/ubuntu-settings.gsettings-override'
--- debian/ubuntu-settings.gsettings-override	2013-06-26 16:31:58 +0000
+++ debian/ubuntu-settings.gsettings-override	2013-08-27 02:34:30 +0000
@@ -82,6 +82,7 @@
 [org.gnome.settings-daemon.peripherals.touchpad]
 disable-while-typing = true
 tap-to-click = true
+scroll-method = "two-finger-scrolling"
 
 [org.gnome.settings-daemon.plugins.power]
 button-power = 'interactive'