diff options
| author | Jonathan Duran | 2012-02-27 11:22:51 -0800 |
|---|---|---|
| committer | Jonathan Duran | 2012-02-27 11:22:51 -0800 |
| commit | ab10898c78f2bd5d765d9c915848ed8c8e08c5a3 (patch) | |
| tree | b1ebb87e9c101c558108e1cec043d64a03cc50a1 /js/panels/Timeline | |
| parent | fb8aacbadba8dffb9619eb16e4626c197dc9264d (diff) | |
| parent | da60be29baab67440535b6b2b71fe7de989dfed0 (diff) | |
| download | ninja-ab10898c78f2bd5d765d9c915848ed8c8e08c5a3.tar.gz | |
Merge branch 'refs/heads/integration-candidate' into Timeline
Diffstat (limited to 'js/panels/Timeline')
| -rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html index 9d0b8210..92adee05 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html | |||
| @@ -299,7 +299,7 @@ | |||
| 299 | </div> | 299 | </div> |
| 300 | </div> | 300 | </div> |
| 301 | 301 | ||
| 302 | <div id="layer_resizer" class="layerresizer"></div> | 302 | <div data-montage-id="layer_resizer" class="layerresizer"></div> |
| 303 | 303 | ||
| 304 | <div id="timeline_rightpane" class="tl_rightpane"> | 304 | <div id="timeline_rightpane" class="tl_rightpane"> |
| 305 | <div id="right_inside" class="rightinside"> | 305 | <div id="right_inside" class="rightinside"> |