Merge remote-tracking branch 'origin/master' into develop

layouts/default/60_jis/info.json

@@ -34,7 +34,6 @@
                 {"x": 10.5, "y": 1},
                 {"x": 11.5, "y": 1},
                 {"x": 12.5, "y": 1},
-                {"x": 13.75, "y": 1, "w": 1.25, "h": 2},
 
                 {"x": 0, "y": 2, "w": 1.75},
                 {"x": 1.75, "y": 2},
@@ -49,6 +48,7 @@
                 {"x": 10.75, "y": 2},
                 {"x": 11.75, "y": 2},
                 {"x": 12.75, "y": 2},
+                {"x": 13.75, "y": 1, "w": 1.25, "h": 2},
 
                 {"x": 0, "y": 3, "w": 2.25},
                 {"x": 2.25, "y": 3},

layouts/default/tkl_f13_jis/info.json

@@ -55,7 +55,6 @@
                 {"x": 10.5, "y": 2.25},
                 {"x": 11.5, "y": 2.25},
                 {"x": 12.5, "y": 2.25},
-                {"x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
                 {"x": 15.25, "y": 2.25},
                 {"x": 16.25, "y": 2.25},
                 {"x": 17.25, "y": 2.25},
@@ -73,6 +72,7 @@
                 {"x": 10.75, "y": 3.25},
                 {"x": 11.75, "y": 3.25},
                 {"x": 12.75, "y": 3.25},
+                {"x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
 
                 {"x": 0, "y": 4.25, "w": 2.25},
                 {"x": 2.25, "y": 4.25},

layouts/default/tkl_jis/info.json

@@ -54,7 +54,6 @@
                 {"x": 10.5, "y": 2.25},
                 {"x": 11.5, "y": 2.25},
                 {"x": 12.5, "y": 2.25},
-                {"x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
                 {"x": 15.25, "y": 2.25},
                 {"x": 16.25, "y": 2.25},
                 {"x": 17.25, "y": 2.25},
@@ -72,6 +71,7 @@
                 {"x": 10.75, "y": 3.25},
                 {"x": 11.75, "y": 3.25},
                 {"x": 12.75, "y": 3.25},
+                {"x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
 
                 {"x": 0, "y": 4.25, "w": 2.25},
                 {"x": 2.25, "y": 4.25},