diff options
| author | Kruti Shah | 2012-02-08 09:45:29 -0800 |
|---|---|---|
| committer | Kruti Shah | 2012-02-08 09:45:29 -0800 |
| commit | 6787bda807ad3974b29cab77628cc5c3c1b06a9d (patch) | |
| tree | 61d2439e2edb0dd9c84b5f32fe35e57707b87637 /js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html | |
| parent | 2cfa420f48735e2718cd0824d4e945c72158d0fa (diff) | |
| parent | 91df2e8030db394060667202a97138db3f871fa5 (diff) | |
| download | ninja-6787bda807ad3974b29cab77628cc5c3c1b06a9d.tar.gz | |
Merge branch 'refs/heads/Timeline' into Timeline_updated
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html')
| -rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html index 35f348c7..9ed69f4a 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html | |||
| @@ -34,7 +34,8 @@ | |||
| 34 | "element": {"#": "layer_resizer"}, | 34 | "element": {"#": "layer_resizer"}, |
| 35 | "panel" : {"#" : "timeline_leftpane"}, | 35 | "panel" : {"#" : "timeline_leftpane"}, |
| 36 | "isVertical" : false, | 36 | "isVertical" : false, |
| 37 | "isInversed" : false | 37 | "isInversed" : false, |
| 38 | "isPanel" : false | ||
| 38 | } | 39 | } |
| 39 | }, | 40 | }, |
| 40 | 41 | ||