Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
b31c914f0f
1 changed files with 3 additions and 3 deletions
|
@ -188,7 +188,6 @@
|
||||||
{"x":10.5, "y":1},
|
{"x":10.5, "y":1},
|
||||||
{"x":11.5, "y":1},
|
{"x":11.5, "y":1},
|
||||||
{"x":12.5, "y":1},
|
{"x":12.5, "y":1},
|
||||||
{"x":13.5, "y":1, "w":1.5},
|
|
||||||
{"x":15, "y":1},
|
{"x":15, "y":1},
|
||||||
|
|
||||||
{"x":0, "y":2, "w":1.75},
|
{"x":0, "y":2, "w":1.75},
|
||||||
|
@ -203,6 +202,7 @@
|
||||||
{"x":9.75, "y":2},
|
{"x":9.75, "y":2},
|
||||||
{"x":10.75, "y":2},
|
{"x":10.75, "y":2},
|
||||||
{"x":11.75, "y":2},
|
{"x":11.75, "y":2},
|
||||||
|
{"x":12.75, "y":2},
|
||||||
{"x":13.75, "y":1, "w":1.25, "h":2},
|
{"x":13.75, "y":1, "w":1.25, "h":2},
|
||||||
{"x":15, "y":2},
|
{"x":15, "y":2},
|
||||||
|
|
||||||
|
@ -265,6 +265,7 @@
|
||||||
{"x":10.5, "y":1},
|
{"x":10.5, "y":1},
|
||||||
{"x":11.5, "y":1},
|
{"x":11.5, "y":1},
|
||||||
{"x":12.5, "y":1},
|
{"x":12.5, "y":1},
|
||||||
|
{"x":13.5, "y":1, "w":1.5},
|
||||||
{"x":15, "y":1},
|
{"x":15, "y":1},
|
||||||
|
|
||||||
{"x":0, "y":2, "w":1.75},
|
{"x":0, "y":2, "w":1.75},
|
||||||
|
@ -279,8 +280,7 @@
|
||||||
{"x":9.75, "y":2},
|
{"x":9.75, "y":2},
|
||||||
{"x":10.75, "y":2},
|
{"x":10.75, "y":2},
|
||||||
{"x":11.75, "y":2},
|
{"x":11.75, "y":2},
|
||||||
{"x":12.75, "y":2},
|
{"x":12.75, "y":2, "w":2.25},
|
||||||
{"x":13.75, "y":1, "w":1.25, "h":2},
|
|
||||||
{"x":15, "y":2},
|
{"x":15, "y":2},
|
||||||
|
|
||||||
{"x":0, "y":3, "w":2.25},
|
{"x":0, "y":3, "w":2.25},
|
||||||
|
|
Loading…
Reference in a new issue