diff options
author | Jose Antonio Marquez | 2012-05-07 10:38:04 -0700 |
---|---|---|
committer | Jose Antonio Marquez | 2012-05-07 10:38:04 -0700 |
commit | 5293ede5f3493900df93da33197416d853f8d907 (patch) | |
tree | 3155deaea5616fa09fc96c84567419fec5f288a2 /js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html | |
parent | 9c0bda09a502472768f6dd5090a882d11be58d23 (diff) | |
parent | 30e837ade2da7cb20caf7c5a69faf0888736bb9a (diff) | |
download | ninja-5293ede5f3493900df93da33197416d853f8d907.tar.gz |
Merge branch 'refs/heads/Ninja-DOM-Architecture' into Document
Diffstat (limited to 'js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html')
-rw-r--r-- | js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html index 44ad9abb..5c5a8b76 100644 --- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html +++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html | |||
@@ -15,7 +15,6 @@ | |||
15 | "properties": { | 15 | "properties": { |
16 | "element": {"#": "track"}, | 16 | "element": {"#": "track"}, |
17 | "tweenRepetition" : {"@" : "tweenRepetition"}, | 17 | "tweenRepetition" : {"@" : "tweenRepetition"}, |
18 | "styleTracksRepetition" : {"@" : "styleTracksRepetition"}, | ||
19 | "tween": {"@" : "tween"}, | 18 | "tween": {"@" : "tween"}, |
20 | "_mainCollapser" : {"@" : "mainCollapser"}, | 19 | "_mainCollapser" : {"@" : "mainCollapser"}, |
21 | "_positionCollapser" : {"@" : "positionCollapser"}, | 20 | "_positionCollapser" : {"@" : "positionCollapser"}, |