Merge lp:~mcintire-evan/ubuntu-terminal-app/fix-function-keys into lp:~ubuntu-terminal-dev/ubuntu-terminal-app/reboot

[Evan McIntire]

Fix missing commit message.

F10 is listed twice in FunctionKeys.json, and F12 is not listed at all. This corrects that

[Alan Pope 🍺🐧🐱 🦄 (popey)]

Thanks for the fix Evan!

review: Approve

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

FAILED: Autolanding.
No commit message was specified in the merge proposal. Hit 'Add commit message' on the merge proposal web page or follow the link below. You can approve the merge proposal yourself to rerun.
https://code.launchpad.net/~mcintire-evan/ubuntu-terminal-app/fix-function-keys/+merge/281461/+edit-commit-message

review: Needs Fixing (continuous-integration)

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

FAILED: Autolanding.
More details in the following jenkins job:
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-autolanding/26/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-land-mp/1426/console

review: Needs Fixing (continuous-integration)

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

review: Approve (continuous-integration)

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

FAILED: Autolanding.
Approved revid is not set in launchpad. This is most likely a launchpad issue and re-approve should fix it. There is also a chance (although a very small one) this is a permission problem of the ps-jenkins bot.
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-autolanding/29/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-land-mp/1430/console

review: Needs Fixing (continuous-integration)

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

review: Approve (continuous-integration)

=== modified file 'src/app/qml/KeyboardRows/Layouts/FunctionKeys.json'
--- src/app/qml/KeyboardRows/Layouts/FunctionKeys.json	2015-07-10 14:34:00 +0000
+++ src/app/qml/KeyboardRows/Layouts/FunctionKeys.json	2016-01-02 06:29:24 +0000
@@ -72,14 +72,14 @@
         {
             "main_action" : {
                 "type": "key",
-                "key" : "F10"
-            }
-        },
-        {
-            "main_action" : {
-                "type": "key",
                 "key" : "F11"
             }
+        },
+        {
+            "main_action" : {
+                "type": "key",
+                "key" : "F12"
+            }
         }
     ]
 }