diff options
| author | Jonathan Duran | 2012-06-12 11:18:43 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-06-12 11:18:43 -0700 |
| commit | 03478f396977973f95977cf21c98bf6a2fa26721 (patch) | |
| tree | f1813de0471d9deb3fba1981d169cdaf39570b74 /js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html | |
| parent | f555dbb070dae53bf81f49d148d59f0a32726811 (diff) | |
| download | ninja-03478f396977973f95977cf21c98bf6a2fa26721.tar.gz | |
montage v10 serialization updates for timeline
Signed-off-by: Jonathan Duran <jduran@motorola.com>
Conflicts:
js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html')
| -rw-r--r-- | js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html index 0d7f517f..8c550f00 100644 --- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html +++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | <!DOCTYPE html> | 1 | <!DOCTYPE html> |
| 2 | <!-- <copyright> | 2 | <!-- <copyright> |
| 3 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | 3 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> |
| 4 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | 4 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> |
| @@ -17,9 +17,10 @@ | |||
| 17 | "tweenRepetition" : {"@" : "tweenRepetition"}, | 17 | "tweenRepetition" : {"@" : "tweenRepetition"}, |
| 18 | "track_lanes" : {"#" : "track_lanes"}, | 18 | "track_lanes" : {"#" : "track_lanes"}, |
| 19 | "tween": {"@" : "tween"}, | 19 | "tween": {"@" : "tween"}, |
| 20 | "_mainCollapser" : {"@" : "mainCollapser"}, | 20 | "mainCollapser" : {"@" : "mainCollapser"}, |
| 21 | "_positionCollapser" : {"@" : "positionCollapser"}, | 21 | "positionCollapser" : {"@" : "positionCollapser"}, |
| 22 | "_styleCollapser" : {"@" : "styleCollapser"} | 22 | "transformCollapser" : {"@" : "transformCollapser"}, |
| 23 | "styleCollapser" : {"@" : "styleCollapser"} | ||
| 23 | } | 24 | } |
| 24 | }, | 25 | }, |
| 25 | 26 | ||