diff options
| author | Jonathan Duran | 2012-03-23 07:26:49 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-03-23 07:26:49 -0700 |
| commit | 4bf42c311178d803012b506ec955ceaa5ef9547b (patch) | |
| tree | b9872985467a8f31e3fbbef6b9f7347fa0a6254a /js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html | |
| parent | 846d539997bf188b9caf63cdf0008367fe6c9ede (diff) | |
| parent | 2d9cb9ca8f6beb661a3d904b5125afa8243661de (diff) | |
| download | ninja-4bf42c311178d803012b506ec955ceaa5ef9547b.tar.gz | |
Merge branch 'refs/heads/Timeline-local' into TimelineUber
Diffstat (limited to 'js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html')
| -rw-r--r-- | js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html index 7e9b8a21..2d508b3c 100644 --- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html +++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html | |||
| @@ -200,7 +200,7 @@ | |||
| 200 | "properties" : { | 200 | "properties" : { |
| 201 | "element" : {"#" : "content-styles"}, | 201 | "element" : {"#" : "content-styles"}, |
| 202 | "myContent" : {"#":"content-styles"}, | 202 | "myContent" : {"#":"content-styles"}, |
| 203 | "contentHeight" : 40, | 203 | "contentHeight" : 0, |
| 204 | "isLabelClickable" : false, | 204 | "isLabelClickable" : false, |
| 205 | "clicker" : {"#" : "label-styles"}, | 205 | "clicker" : {"#" : "label-styles"}, |
| 206 | "isCollapsed" : true, | 206 | "isCollapsed" : true, |