diff options
| author | Jonathan Duran | 2012-07-19 08:41:49 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-07-19 08:41:49 -0700 |
| commit | 142dc59794769ad783ab050b27b4f56ac5773afb (patch) | |
| tree | c6b478666eab9e637039467d70e948e1e0e46882 /js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html | |
| parent | 16d06bac95ce8334f8c5586750e98360dbc9cbd9 (diff) | |
| parent | 0b899ad6cec5e4626dfa32230be7c04d22d4f820 (diff) | |
| download | ninja-142dc59794769ad783ab050b27b4f56ac5773afb.tar.gz | |
Merge branch 'refs/heads/Timeline-local-kruti' into TimelineUber
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html')
| -rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html index c287e68e..593b4ea1 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html | |||
| @@ -63,7 +63,8 @@ POSSIBILITY OF SUCH DAMAGE. | |||
| 63 | "tl_configbutton" : {"#" : "tl-configbutton"}, | 63 | "tl_configbutton" : {"#" : "tl-configbutton"}, |
| 64 | "checkable_lock" : {"#" : "checkable_lock"}, | 64 | "checkable_lock" : {"#" : "checkable_lock"}, |
| 65 | "checkable_visible":{"#" : "checkable_visible"}, | 65 | "checkable_visible":{"#" : "checkable_visible"}, |
| 66 | "play_button" : {"#" : "play_button"} | 66 | "play_button" : {"#" : "play_button"}, |
| 67 | "zoom_slider" : {"@" : "timelineZoomSlider"} | ||
| 67 | } | 68 | } |
| 68 | }, | 69 | }, |
| 69 | 70 | ||