Merge lp:~sil2100/unity/dummy_merge into lp:~unity-team/unity/release-quantal

[Łukasz Zemczak]

Correct whitespace indentation in unityshell.xml.in.

A very important change. This indentation error has been troubling people since the ancient ages. We must correct this to save the earth and fulfill our destinies. Ok, just joking.

Dummy merge for lp:~unity-team/unity/release-quantal to issue a rebuild, and see if there are no problems with the branch.

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/1135/console reported an error when processing this lp:~sil2100/unity/dummy_merge branch.
Not merging it.

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/1136/console reported an error when processing this lp:~sil2100/unity/dummy_merge branch.
Not merging it.

[Timo Jyrinki (timo-jyrinki)]

review: Approve

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/1145/console reported an error when processing this lp:~sil2100/unity/dummy_merge branch.
Not merging it.

=== modified file 'plugins/unityshell/unityshell.xml.in'
--- plugins/unityshell/unityshell.xml.in	2012-08-07 10:41:46 +0000
+++ plugins/unityshell/unityshell.xml.in	2012-08-27 11:36:26 +0000
@@ -46,7 +46,7 @@
                     <_long>Make the HUD appear with this key</_long>
                     <default>&lt;Alt&gt;</default>
                   </option>
-	              <option name="launcher_hide_mode" type="int">
+                <option name="launcher_hide_mode" type="int">
                     <_short>Hide Launcher</_short>
                     <_long>Make the launcher hide automatically after some time of inactivity: always or just when the focussed window is not over the launcher</_long>
                     <min>0</min>