Merge lp:~elementary-os/elementaryos/default-settings-terminal into lp:~elementary-os/elementaryos/default-settings-trusty

[Danielle Foré]

Fix the default terminal schema which causes Terminal not to launch and also causes a 100% CPU issue (lp:1355150)

Fix the default terminal schema which causes Terminal not to launch and also causes a 100% CPU issue https://bugs.launchpad.net/elementaryos/+bug/1355150

[lp:~elementary-os/elementaryos/default-settings-terminal]

116. By Danielle Foré on 2014-08-31

change launch terminal shortcut to super T

117. By Danielle Foré on 2014-08-31

change launch terminal shortcut to super T

=== modified file 'debian/elementary-default-settings.gsettings-override'
--- debian/elementary-default-settings.gsettings-override	2014-07-10 19:29:11 +0000
+++ debian/elementary-default-settings.gsettings-override	2014-08-31 16:20:54 +0000
@@ -12,6 +12,9 @@
 primary-color='#000000'
 show-desktop-icons=false
 
+[org.gnome.desktop.default-applications.terminal]
+exec='pantheon-terminal'
+
 [org.gnome.desktop.interface]
 cursor-theme='DMZ-Black'
 document-font-name='Open Sans 10'
@@ -99,6 +102,7 @@
 
 [org.gnome.settings-daemon.plugins.media-keys]
 screensaver='<Super>l'
+terminal='<Super>t'
 
 [org.gnome.settings-daemon.plugins.power]
 idle-dim=false
@@ -115,4 +119,4 @@
 [org.pantheon.scratch.settings]
 highlight-matching-brackets=true
 show-line-numbers=true
-style-scheme='solarizedlight'
+style-scheme='solarizedlight'
\ No newline at end of file