aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/Layer.reel/Layer.html
diff options
context:
space:
mode:
authorJonathan Duran2012-05-11 14:13:07 -0700
committerJonathan Duran2012-05-11 14:13:07 -0700
commit1e2138fc7d0007b0ad3cb4807dc1c9101190f2f2 (patch)
tree2563aa7694c3caaf813ca71ef3250b2a76ee0041 /js/panels/Timeline/Layer.reel/Layer.html
parent32257ac142f872d3c1f6c07504bae77ae884ed93 (diff)
parent6fcaa4e923a19672b5860b4c6f67d836680e7e99 (diff)
downloadninja-1e2138fc7d0007b0ad3cb4807dc1c9101190f2f2.tar.gz
Merge branch 'refs/heads/TimelineUber' into TimelineProps
Diffstat (limited to 'js/panels/Timeline/Layer.reel/Layer.html')
-rw-r--r--js/panels/Timeline/Layer.reel/Layer.html4
1 files changed, 1 insertions, 3 deletions
diff --git a/js/panels/Timeline/Layer.reel/Layer.html b/js/panels/Timeline/Layer.reel/Layer.html
index ba7c18c3..c7e7b575 100644
--- a/js/panels/Timeline/Layer.reel/Layer.html
+++ b/js/panels/Timeline/Layer.reel/Layer.html
@@ -17,13 +17,11 @@
17 "styleRepetition" : {"@":"repetition1"}, 17 "styleRepetition" : {"@":"repetition1"},
18 "dynamicLayerName" : {"@":"dtext1"}, 18 "dynamicLayerName" : {"@":"dtext1"},
19 "dynamicLayerTag" : {"@": "dtext2"}, 19 "dynamicLayerTag" : {"@": "dtext2"},
20 "slotStyle" : {"@":"slot1"},
21 "mainCollapser" : {"@" : "mainCollapser"}, 20 "mainCollapser" : {"@" : "mainCollapser"},
22 "positionCollapser" : {"@" : "positionCollapser"}, 21 "positionCollapser" : {"@" : "positionCollapser"},
23 "styleCollapser" : {"@" : "styleCollapser"}, 22 "styleCollapser" : {"@" : "styleCollapser"},
24 "clickerMain" : {"#" : "clicker-main"}, 23 "clickerMain" : {"#" : "clicker-main"},
25 "myLabel" : {"#" : "myLabel"}, 24 "myLabel" : {"#" : "myLabel"}
26 "dragDrop" : {"@" : "DragDrop"}
27 } 25 }
28 }, 26 },
29 "dtext1" : { 27 "dtext1" : {