diff options
| author | Valerio Virgillito | 2012-06-12 11:13:39 -0700 |
|---|---|---|
| committer | Valerio Virgillito | 2012-06-12 11:13:39 -0700 |
| commit | c08220b45b9a22e87955671a5223c6c55b78053b (patch) | |
| tree | 0af1aaf4f781061191e0541bdbaf51b24f4b9413 /js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html | |
| parent | 471776facca730c57b0f6b8448535914df6624fd (diff) | |
| parent | 962d8d11c68761a1c3c89289dc0f6d9de07da755 (diff) | |
| download | ninja-c08220b45b9a22e87955671a5223c6c55b78053b.tar.gz | |
Merge branch 'montage-v10-integration' of github.com:Motorola-Mobility/ninja-internal into montage-v10-integration
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 | ||