diff options
| author | Jon Reid | 2012-06-12 13:32:02 -0700 |
|---|---|---|
| committer | Jon Reid | 2012-06-12 13:32:02 -0700 |
| commit | 8c55dfcb0a669eef0a3bb406b70868078ef09810 (patch) | |
| tree | e4d070fe1e67fea38cc0343eda297572da717efa /js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html | |
| parent | 8e98ce012f55576ddb979969a3a1d834301af0c7 (diff) | |
| parent | 7887aafbff794e9c5f918c667e73a8386c38cf02 (diff) | |
| download | ninja-8c55dfcb0a669eef0a3bb406b70868078ef09810.tar.gz | |
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local
Diffstat (limited to 'js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html')
| -rw-r--r-- | js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html index 0d7f517f..502c455b 100644 --- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html +++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html | |||
| @@ -17,9 +17,9 @@ | |||
| 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 | "styleCollapser" : {"@" : "styleCollapser"} |
| 23 | } | 23 | } |
| 24 | }, | 24 | }, |
| 25 | 25 | ||