diff options
| author | Pushkar Joshi | 2012-05-22 13:22:26 -0700 |
|---|---|---|
| committer | Pushkar Joshi | 2012-05-22 13:22:26 -0700 |
| commit | 01dbc1f329a95bc7e3b93224543d88ad5bdbd315 (patch) | |
| tree | ceb527713554f506c537168e36a10452cd09ad10 /js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html | |
| parent | b9262c831952e77135b79c2de7c455d5e7ff0589 (diff) | |
| parent | c37a876b373ddc7cb19277aaeaa6bb2d2d5a50ac (diff) | |
| download | ninja-01dbc1f329a95bc7e3b93224543d88ad5bdbd315.tar.gz | |
Merge branch 'master' into brushtool
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"}, |