Merge remote-tracking branch 'origin/master' into develop
commit
e7d8c189f1
|
@ -184,7 +184,7 @@
|
|||
{"matrix": [1, 11], "x": 11.5, "y": 1},
|
||||
{"matrix": [1, 12], "x": 12.5, "y": 1},
|
||||
{"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
|
||||
{"matrix": [1, 14], "x": 15, "y": 1.25},
|
||||
{"matrix": [1, 14], "x": 15, "y": 1},
|
||||
{"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
|
||||
{"matrix": [2, 1], "x": 1.75, "y": 2},
|
||||
{"matrix": [2, 2], "x": 2.75, "y": 2},
|
||||
|
@ -197,8 +197,8 @@
|
|||
{"matrix": [2, 9], "x": 9.75, "y": 2},
|
||||
{"matrix": [2, 10], "x": 10.75, "y": 2},
|
||||
{"matrix": [2, 11], "x": 11.75, "y": 2},
|
||||
{"matrix": [2, 13], "x": 12.75, "y": 2, "w": 1.75},
|
||||
{"matrix": [2, 14], "x": 15, "y": 2.25},
|
||||
{"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
|
||||
{"matrix": [2, 14], "x": 15, "y": 2},
|
||||
{"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
|
||||
{"matrix": [3, 1], "x": 2.25, "y": 3},
|
||||
{"matrix": [3, 2], "x": 3.25, "y": 3},
|
||||
|
@ -217,8 +217,8 @@
|
|||
{"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
|
||||
{"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
|
||||
{"matrix": [4, 3], "x": 3.75, "y": 4, "w": 2.25},
|
||||
{"matrix": [4, 5], "x": 6, "y": 3.75, "w": 1.25},
|
||||
{"matrix": [4, 4], "x": 6, "y": 4, "w": 1.25},
|
||||
{"matrix": [4, 5], "x": 6, "y": 4, "w": 1.25, "h": 0.5},
|
||||
{"matrix": [4, 4], "x": 6, "y": 4.5, "w": 1.25, "h": 0.5},
|
||||
{"matrix": [4, 6], "x": 7.25, "y": 4, "w": 2.75},
|
||||
{"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
|
||||
{"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
|
||||
|
|
Loading…
Reference in New Issue