diff options
| author | Jon Reid | 2012-02-27 12:08:17 -0800 |
|---|---|---|
| committer | Jon Reid | 2012-02-27 12:08:17 -0800 |
| commit | d55224f36da55e26c266a02efa6e58d4ecf1253e (patch) | |
| tree | 36faa8ff93c0f7b925f5c0a7fb85b5d209da1f8e /js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html | |
| parent | ec5f81c6c0ccf865505ab82ebf9240c667f05c91 (diff) | |
| parent | cf9e9b711ba3d77a2a0888f8ab763383f53a1619 (diff) | |
| download | ninja-d55224f36da55e26c266a02efa6e58d4ecf1253e.tar.gz | |
Merge remote-tracking branch 'ninja-jduran/Timeline' into Timeline-local
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html')
| -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 65d2fa7b..1aa9a725 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html | |||
| @@ -300,7 +300,7 @@ | |||
| 300 | </div> | 300 | </div> |
| 301 | </div> | 301 | </div> |
| 302 | 302 | ||
| 303 | <div id="layer_resizer" class="layerresizer"></div> | 303 | <div data-montage-id="layer_resizer" class="layerresizer"></div> |
| 304 | 304 | ||
| 305 | <div id="timeline_rightpane" class="tl_rightpane"> | 305 | <div id="timeline_rightpane" class="tl_rightpane"> |
| 306 | <div id="right_inside" class="rightinside"> | 306 | <div id="right_inside" class="rightinside"> |