Merge lp:~3v1n0/compiz/scale-all-wp-key into lp:compiz/0.9.11

[Marco Trevisan (Treviño)]

debian/patches/ubuntu-config.patch: use Super+Shift+W for initiating scale for all workspaces

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3836
http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-ci/43/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-trusty-amd64-ci/43
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-trusty-armhf-ci/43
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-trusty-i386-ci/43

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/compiz-0.9.11-ci/43/rebuild

review: Approve (continuous-integration)

[Christopher Townsend (townsend)]

LGTM

review: Approve

=== modified file 'debian/patches/ubuntu-config.patch'
--- debian/patches/ubuntu-config.patch	2014-02-18 01:53:40 +0000
+++ debian/patches/ubuntu-config.patch	2014-03-04 18:31:06 +0000
@@ -418,10 +418,18 @@
  			</option>
  			<option name="initiate_button" type="button">
  				<_short>Initiate Window Picker</_short>
-Index: scale-xy-offsets/plugins/staticswitcher/staticswitcher.xml.in
+@@ -161,6 +158,7 @@
+ 			<option name="initiate_all_key" type="key">
+ 				<_short>Initiate Window Picker For All Windows</_short>
+ 				<_long>Layout and start transforming all windows</_long>
++				<default>&lt;Super&gt;&lt;Shift&gt;w</default>
+ 			</option>
+ 			<option name="initiate_group_edge" type="edge">
+ 				<_short>Initiate Window Picker For Window Group</_short>
+Index: compiz/plugins/staticswitcher/staticswitcher.xml.in
 ===================================================================
---- scale-xy-offsets.orig/plugins/staticswitcher/staticswitcher.xml.in	2014-02-17 21:25:57.420121366 +0100
-+++ scale-xy-offsets/plugins/staticswitcher/staticswitcher.xml.in	2014-02-17 21:25:57.412121402 +0100
+--- compiz.orig/plugins/staticswitcher/staticswitcher.xml.in	2014-03-04 19:11:33.195668835 +0100
++++ compiz/plugins/staticswitcher/staticswitcher.xml.in	2014-03-04 19:11:33.187668855 +0100
 @@ -11,7 +11,6 @@
  	    <relation type="after">
  		<plugin>composite</plugin>