aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/Span.reel/Span.html
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-02-23 15:11:51 -0800
committerJose Antonio Marquez2012-02-23 15:11:51 -0800
commitbdc39718cacad2eab10a7d031ea10fda13c92a03 (patch)
tree5fa2ae85a15d8a5067fa6f608c2b285869264ead /js/panels/Timeline/Span.reel/Span.html
parent23b4bbd13345ecd5c00fda60b995a7fb2aab317c (diff)
parent41b69af7c0be3dd5fe4f772668862696af8b917a (diff)
downloadninja-bdc39718cacad2eab10a7d031ea10fda13c92a03.tar.gz
Merge branch 'refs/heads/NinjaInternal' into FileIO
Conflicts: js/controllers/document-controller.js
Diffstat (limited to 'js/panels/Timeline/Span.reel/Span.html')
-rw-r--r--js/panels/Timeline/Span.reel/Span.html6
1 files changed, 2 insertions, 4 deletions
diff --git a/js/panels/Timeline/Span.reel/Span.html b/js/panels/Timeline/Span.reel/Span.html
index e36a25d6..24b2bd10 100644
--- a/js/panels/Timeline/Span.reel/Span.html
+++ b/js/panels/Timeline/Span.reel/Span.html
@@ -9,8 +9,7 @@
9 "module": "js/panels/Timeline/Span.reel", 9 "module": "js/panels/Timeline/Span.reel",
10 "name": "Span", 10 "name": "Span",
11 "properties": { 11 "properties": {
12 "element": {"#": "spanspace"}, 12 "element": {"#": "spanspace"}
13 "tweenspan": {"#": "tweenspan"}
14 } 13 }
15 } 14 }
16 15
@@ -19,8 +18,7 @@
19 </head> 18 </head>
20 <body> 19 <body>
21 20
22 <div id="spanspace"> 21 <div id="spanspace" class="tween_span">
23 <div id="tweenspan" class="tween_span"></div>
24 </div> 22 </div>
25 23
26 </body> 24 </body>