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

keyboards/yoichiro/lunakey_macro/info.json

@@ -7,61 +7,19 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {
-                    "label": "0,2",
-                    "x": 2.5,
-                    "y": 0
-                },
-                {
-                    "label": "0,1",
-                    "x": 1.5,
-                    "y": 0.175
-                },
-                {
-                    "label": "0,0",
-                    "x": 0.5,
-                    "y": 0.5
-                },
-                {
-                    "label": "0,3",
-                    "x": 3.5,
-                    "y": 0.5
-                },
-                {
-                    "label": "1,2",
-                    "x": 2.5,
-                    "y": 1
-                },
-                {
-                    "label": "1,1",
-                    "x": 1.5,
-                    "y": 1.175
-                },
-                {
-                    "label": "1,0",
-                    "x": 0.5,
-                    "y": 1.5
-                },
-                {
-                    "label": "1,3",
-                    "x": 3.5,
-                    "y": 1.5
-                },
-                {
-                    "label": "2,1",
-                    "x": 1,
-                    "y": 2.75
-                },
-                {
-                    "label": "2,0",
-                    "x": 0,
-                    "y": 3
-                },
-                {
-                    "label": "2,2",
-                    "x": 2,
-                    "y": 3
-                }
+                {"label":"0,0", "x":0.5, "y":0.5},
+                {"label":"0,1", "x":1.5, "y":0.175},
+                {"label":"0,2", "x":2.5, "y":0},
+                {"label":"0,3", "x":3.5, "y":0.5},
+
+                {"label":"1,0", "x":0.5, "y":1.5},
+                {"label":"1,1", "x":1.5, "y":1.175},
+                {"label":"1,2", "x":2.5, "y":1},
+                {"label":"1,3", "x":3.5, "y":1.5},
+
+                {"label":"2,0", "x":0, "y":3},
+                {"label":"2,1", "x":1, "y":2.75},
+                {"label":"2,2", "x":2, "y":3}
             ]
         }
     }