diff options
author | Valerio Virgillito | 2012-03-02 15:46:11 -0800 |
---|---|---|
committer | Valerio Virgillito | 2012-03-02 15:46:11 -0800 |
commit | 13f52cf0c74f53a919fa864f86669e8155f82961 (patch) | |
tree | 4d75fcd610e3ce5a306d1de3539b475d2b418bd7 /js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html | |
parent | dced508bb19a7bcd467ff1b86b5df5bbec4be794 (diff) | |
parent | abc04f3d50311ed1c21067344bc7e448686f8c5c (diff) | |
download | ninja-13f52cf0c74f53a919fa864f86669e8155f82961.tar.gz |
Merge pull request #93 from imix23ways/Timeline
Timeline: Critical bug fixes
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html')
-rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html index 1aa9a725..92adee05 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html | |||
@@ -32,8 +32,7 @@ | |||
32 | "timetext" : {"#": "time_text"}, | 32 | "timetext" : {"#": "time_text"}, |
33 | "timebar" : {"#": "time_bar"}, | 33 | "timebar" : {"#": "time_bar"}, |
34 | "container_tracks" : {"#" : "container-tracks"}, | 34 | "container_tracks" : {"#" : "container-tracks"}, |
35 | "end_hottext" : {"@" : "endHottext"}, | 35 | "end_hottext" : {"@" : "endHottext"} |
36 | "getme" : {"#" : "getme"} | ||
37 | } | 36 | } |
38 | }, | 37 | }, |
39 | 38 | ||
@@ -285,7 +284,7 @@ | |||
285 | 284 | ||
286 | <div id="user_layers" class="userlayers"> | 285 | <div id="user_layers" class="userlayers"> |
287 | <div id="master_layer" class="masterlayer"> | 286 | <div id="master_layer" class="masterlayer"> |
288 | <div id="getme">Master Layer</div> | 287 | <div>Master Layer</div> |
289 | </div> | 288 | </div> |
290 | <div id="container-layers"> | 289 | <div id="container-layers"> |
291 | <div id="container-layer"></div> | 290 | <div id="container-layer"></div> |