diff options
| author | Nivesh Rajbhandari | 2012-05-04 15:33:29 -0700 |
|---|---|---|
| committer | Nivesh Rajbhandari | 2012-05-04 15:33:29 -0700 |
| commit | ad94ec51c81badeba2b0f870cad8a0eec7878ebd (patch) | |
| tree | 35c52d44d2c5399ea4019582af3fb55a53ee05c8 /js/panels/Timeline/TimelineTrack.reel | |
| parent | 3ad9024bcfce76e28816daa02bac14fc8985ca62 (diff) | |
| parent | 3ebed34665fa73b0ce613b400f3029ebf4476439 (diff) | |
| download | ninja-ad94ec51c81badeba2b0f870cad8a0eec7878ebd.tar.gz | |
Merge branch 'refs/heads/dom-architecture-master' into Dom-Architecture
Diffstat (limited to 'js/panels/Timeline/TimelineTrack.reel')
| -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"}, |