Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
810cd9bc53
|
@ -107,9 +107,9 @@
|
||||||
{"matrix": [4, 11], "x": 11.25, "y": 4.25},
|
{"matrix": [4, 11], "x": 11.25, "y": 4.25},
|
||||||
{"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
|
{"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
|
||||||
|
|
||||||
{"matrix": [4, 13], "x": 15.5, "y": 4.25},
|
{"matrix": [4, 13], "x": 14.25, "y": 4.5},
|
||||||
|
|
||||||
{"matrix": [4, 14], "x": 14.25, "y": 4.5},
|
{"matrix": [4, 14], "x": 15.5, "y": 4.25},
|
||||||
|
|
||||||
{"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
|
{"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
|
||||||
{"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
|
{"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
|
||||||
|
@ -211,9 +211,9 @@
|
||||||
{"matrix": [4, 11], "x": 11.25, "y": 4.25},
|
{"matrix": [4, 11], "x": 11.25, "y": 4.25},
|
||||||
{"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
|
{"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
|
||||||
|
|
||||||
{"matrix": [4, 13], "x": 15.5, "y": 4.25},
|
{"matrix": [4, 13], "x": 14.25, "y": 4.5},
|
||||||
|
|
||||||
{"matrix": [4, 14], "x": 14.25, "y": 4.5},
|
{"matrix": [4, 14], "x": 15.5, "y": 4.25},
|
||||||
|
|
||||||
{"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
|
{"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
|
||||||
{"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
|
{"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
|
||||||
|
@ -315,9 +315,9 @@
|
||||||
{"matrix": [4, 11], "x": 11.25, "y": 4.25},
|
{"matrix": [4, 11], "x": 11.25, "y": 4.25},
|
||||||
{"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
|
{"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
|
||||||
|
|
||||||
{"matrix": [4, 13], "x": 15.5, "y": 4.25},
|
{"matrix": [4, 13], "x": 14.25, "y": 4.5},
|
||||||
|
|
||||||
{"matrix": [4, 14], "x": 14.25, "y": 4.5},
|
{"matrix": [4, 14], "x": 15.5, "y": 4.25},
|
||||||
|
|
||||||
{"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
|
{"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
|
||||||
{"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
|
{"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
|
||||||
|
@ -420,9 +420,9 @@
|
||||||
{"matrix": [4, 11], "x": 11.25, "y": 4.25},
|
{"matrix": [4, 11], "x": 11.25, "y": 4.25},
|
||||||
{"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
|
{"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
|
||||||
|
|
||||||
{"matrix": [4, 13], "x": 15.5, "y": 4.25},
|
{"matrix": [4, 13], "x": 14.25, "y": 4.5},
|
||||||
|
|
||||||
{"matrix": [4, 14], "x": 14.25, "y": 4.5},
|
{"matrix": [4, 14], "x": 15.5, "y": 4.25},
|
||||||
|
|
||||||
{"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
|
{"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
|
||||||
{"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
|
{"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
|
||||||
|
|
Loading…
Reference in a new issue