diff options
| author | Valerio Virgillito | 2012-07-18 11:45:54 -0700 |
|---|---|---|
| committer | Valerio Virgillito | 2012-07-18 11:45:54 -0700 |
| commit | 2f009ea40ca815a9aff27a5862bba5a6b335586c (patch) | |
| tree | 10a409394038c642c2aa811ba9a0ffaf667dfed7 /js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html | |
| parent | 9730dead250067abad10625c2da46cbd24fc0a1e (diff) | |
| parent | ecc2f1c6296ac5e706b1d6388254c8df24a01066 (diff) | |
| download | ninja-2f009ea40ca815a9aff27a5862bba5a6b335586c.tar.gz | |
Merge branch 'refs/heads/master' into menu-fixes
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html')
| -rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html | 2 |
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> |