diff options
| author | Armen Kesablyan | 2012-06-19 00:45:26 -0700 |
|---|---|---|
| committer | Armen Kesablyan | 2012-06-19 00:45:26 -0700 |
| commit | c59eb371559a3061ce53223e249ca97daace5968 (patch) | |
| tree | f9540e26c0f273d35f92010605da65dd85bbe70c /js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html | |
| parent | 0f040acabfb7a4bf3138debec5aff869487ceb11 (diff) | |
| parent | 918a4f5870e972b6e4e301c3237e065a1ffd26f5 (diff) | |
| download | ninja-c59eb371559a3061ce53223e249ca97daace5968.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal
Diffstat (limited to 'js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html')
| -rw-r--r-- | js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html index 5c5a8b76..091470f3 100644 --- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html +++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html | |||
| @@ -16,10 +16,10 @@ | |||
| 16 | "element": {"#": "track"}, | 16 | "element": {"#": "track"}, |
| 17 | "tweenRepetition" : {"@" : "tweenRepetition"}, | 17 | "tweenRepetition" : {"@" : "tweenRepetition"}, |
| 18 | "tween": {"@" : "tween"}, | 18 | "tween": {"@" : "tween"}, |
| 19 | "_mainCollapser" : {"@" : "mainCollapser"}, | 19 | "mainCollapser" : {"@" : "mainCollapser"}, |
| 20 | "_positionCollapser" : {"@" : "positionCollapser"}, | 20 | "positionCollapser" : {"@" : "positionCollapser"}, |
| 21 | "_transformCollapser" : {"@" : "transformCollapser"}, | 21 | "transformCollapser" : {"@" : "transformCollapser"}, |
| 22 | "_styleCollapser" : {"@" : "styleCollapser"} | 22 | "styleCollapser" : {"@" : "styleCollapser"} |
| 23 | } | 23 | } |
| 24 | }, | 24 | }, |
| 25 | 25 | ||