aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/TimelinePanel.reel
diff options
context:
space:
mode:
authorValerio Virgillito2012-02-27 10:51:15 -0800
committerValerio Virgillito2012-02-27 10:51:15 -0800
commitda60be29baab67440535b6b2b71fe7de989dfed0 (patch)
tree3cda434387f2aa6744808b2b0b4e7571d6d3a467 /js/panels/Timeline/TimelinePanel.reel
parenta5d635a29de97a7daa93b9036d7a7dce48f07670 (diff)
parent72baf1c366829ada6858097dd7553ee9988d6110 (diff)
downloadninja-da60be29baab67440535b6b2b71fe7de989dfed0.tar.gz
Merge branch 'local-storage-version' of https://github.com/mencio/ninja-internal into integration-candidate
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel')
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html2
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 0c302436..0fd5b05d 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
@@ -264,7 +264,7 @@
264 </div> 264 </div>
265 </div> 265 </div>
266 266
267 <div id="layer_resizer" class="layerresizer"></div> 267 <div data-montage-id="layer_resizer" class="layerresizer"></div>
268 268
269 <div id="timeline_rightpane" class="tl_rightpane"> 269 <div id="timeline_rightpane" class="tl_rightpane">
270 <div id="right_inside" class="rightinside"> 270 <div id="right_inside" class="rightinside">