diff options
author | Valerio Virgillito | 2012-02-29 15:04:36 -0800 |
---|---|---|
committer | Valerio Virgillito | 2012-02-29 15:04:36 -0800 |
commit | b09956e4a9a35c5588cc7cd1f01efb617cbe0884 (patch) | |
tree | 49b07dfb52252ac986c567ad5c3a7c39ebcc86e2 /js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html | |
parent | 551e1f2be11e9e6ab7af17816396b88aafd57dff (diff) | |
parent | 2b9f63089534356607ad7e0ddde6f22e42d04f80 (diff) | |
download | ninja-b09956e4a9a35c5588cc7cd1f01efb617cbe0884.tar.gz |
Merge branch 'refs/heads/integration-candidate'
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html')
-rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html index 92adee05..1aa9a725 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html | |||
@@ -32,7 +32,8 @@ | |||
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"} | ||
36 | } | 37 | } |
37 | }, | 38 | }, |
38 | 39 | ||
@@ -284,7 +285,7 @@ | |||
284 | 285 | ||
285 | <div id="user_layers" class="userlayers"> | 286 | <div id="user_layers" class="userlayers"> |
286 | <div id="master_layer" class="masterlayer"> | 287 | <div id="master_layer" class="masterlayer"> |
287 | <div>Master Layer</div> | 288 | <div id="getme">Master Layer</div> |
288 | </div> | 289 | </div> |
289 | <div id="container-layers"> | 290 | <div id="container-layers"> |
290 | <div id="container-layer"></div> | 291 | <div id="container-layer"></div> |