Merge lp:~didrocks/unity-2d/default-gconf-value into lp:unity-2d

[Didier Roche]

set a default key for HUD showing on Alt, in case unity-3d isn't
installed or run before unity-2d.

set a default key for HUD showing on Alt, in case unity-3d isn't
installed or run before unity-2d.

[Albert Astals Cid (aacid)]

Makes sense

=== modified file 'debian/20_ubuntu-2d-gconf-default'
--- debian/20_ubuntu-2d-gconf-default	2011-07-26 16:16:52 +0000
+++ debian/20_ubuntu-2d-gconf-default	2012-04-03 09:22:19 +0000
@@ -3,3 +3,4 @@
 /apps/metacity/general/capture_before_unmap true
 /apps/metacity/general/compositing_manager true
 /apps/metacity/general/compositor_effects false
+/apps/compiz-1/plugins/unityshell/screen0/options/show_hud "<Alt>"

=== modified file 'debian/changelog'
--- debian/changelog	2012-03-23 15:09:01 +0000
+++ debian/changelog	2012-04-03 09:22:19 +0000
@@ -1,3 +1,11 @@
+unity-2d (5.8.0-0ubuntu2) UNRELEASED; urgency=low
+
+  * debian/20_ubuntu-2d-gconf-default:
+    - set a default key for HUD showing on Alt, in case unity-3d isn't
+      installed or run before unity-2d.
+
+ -- Didier Roche <[e-mail]>  Tue, 03 Apr 2012 11:14:50 +0200
+
 unity-2d (5.8.0-0ubuntu1) precise-proposed; urgency=low
 
   * New upstream release