aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/Keyframe.reel/Keyframe.html
diff options
context:
space:
mode:
authorValerio Virgillito2012-02-23 17:05:43 -0800
committerValerio Virgillito2012-02-23 17:05:43 -0800
commitafc53c6f553c97ab778154154aa2b7a146cb5fef (patch)
tree66b5ec886a49894feda44ccf8b5233ef39a46536 /js/panels/Timeline/Keyframe.reel/Keyframe.html
parent8974ecd564563a991ff96f9cb6d47da172174242 (diff)
parentdb2fd02a1b0e909bb536fa63cefd2144f4642ead (diff)
downloadninja-afc53c6f553c97ab778154154aa2b7a146cb5fef.tar.gz
Merge branch 'refs/heads/master' into local-storage-version
Diffstat (limited to 'js/panels/Timeline/Keyframe.reel/Keyframe.html')
-rw-r--r--js/panels/Timeline/Keyframe.reel/Keyframe.html6
1 files changed, 2 insertions, 4 deletions
diff --git a/js/panels/Timeline/Keyframe.reel/Keyframe.html b/js/panels/Timeline/Keyframe.reel/Keyframe.html
index bf21994b..72da49d5 100644
--- a/js/panels/Timeline/Keyframe.reel/Keyframe.html
+++ b/js/panels/Timeline/Keyframe.reel/Keyframe.html
@@ -9,8 +9,7 @@
9 "module": "js/panels/Timeline/Keyframe.reel", 9 "module": "js/panels/Timeline/Keyframe.reel",
10 "name": "Keyframe", 10 "name": "Keyframe",
11 "properties": { 11 "properties": {
12 "element": {"#": "keyframespace"}, 12 "element": {"#": "keyframespace"}
13 "tweenkeyframe": {"#": "tweenkeyframe"}
14 } 13 }
15 } 14 }
16 15
@@ -19,8 +18,7 @@
19 </head> 18 </head>
20 <body> 19 <body>
21 20
22 <div id="keyframespace"> 21 <div id="keyframespace" class="tween_keyframe">
23 <div id="tweenkeyframe" class="tween_keyframe"></div>
24 </div> 22 </div>
25 23
26 </body> 24 </body>