aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-07-18 11:42:46 -0700
committerJose Antonio Marquez2012-07-18 11:42:46 -0700
commit00d11977825e56a1306f2ed13125b94cae369854 (patch)
tree4c5c6b03810ed5099a641d43939e39f28ba7797c /js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
parenta8ca472ec3a1d1510000fd83d6904cbd0e9981b5 (diff)
parentecc2f1c6296ac5e706b1d6388254c8df24a01066 (diff)
downloadninja-00d11977825e56a1306f2ed13125b94cae369854.tar.gz
Merge branch 'refs/heads/Ninja-Master' into Tracking
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>