aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
diff options
context:
space:
mode:
authorValerio Virgillito2012-07-18 11:29:32 -0700
committerValerio Virgillito2012-07-18 11:29:32 -0700
commit490b44befa8842b3013a06b8d3f176db0d095bbf (patch)
tree77aadc31c173ebc12426bff5fa28c86d53205305 /js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
parent569a005bdd45ac9d4eda95c64eb7e4af78fb196e (diff)
parentc075d1ce399dabe270214e1fe707be55d2e28c0c (diff)
downloadninja-490b44befa8842b3013a06b8d3f176db0d095bbf.tar.gz
Merge branch 'TimelineUber' of https://github.com/imix23ways/ninja into v0.7.1
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html')
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html2
1 files changed, 2 insertions, 0 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
index 6c5e030c..c287e68e 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
@@ -217,7 +217,9 @@ POSSIBILITY OF SUCH DAMAGE.
217 </div> 217 </div>
218 218
219 <div data-montage-id="timeline_gutter" class="timelinegutter"> 219 <div data-montage-id="timeline_gutter" class="timelinegutter">
220 <div class="sliderClass">
220 <div data-montage-id="tl_slider" class="tl_slider"></div> 221 <div data-montage-id="tl_slider" class="tl_slider"></div>
222 </div>
221 <input data-montage-id="end_hottext" class="endhottext"> 223 <input data-montage-id="end_hottext" class="endhottext">
222 </div> 224 </div>
223 </div> 225 </div>