diff options
| author | Kruti Shah | 2012-02-08 09:45:29 -0800 |
|---|---|---|
| committer | Kruti Shah | 2012-02-08 09:45:29 -0800 |
| commit | 6787bda807ad3974b29cab77628cc5c3c1b06a9d (patch) | |
| tree | 61d2439e2edb0dd9c84b5f32fe35e57707b87637 /js/panels/Timeline/Tween.reel | |
| parent | 2cfa420f48735e2718cd0824d4e945c72158d0fa (diff) | |
| parent | 91df2e8030db394060667202a97138db3f871fa5 (diff) | |
| download | ninja-6787bda807ad3974b29cab77628cc5c3c1b06a9d.tar.gz | |
Merge branch 'refs/heads/Timeline' into Timeline_updated
Diffstat (limited to 'js/panels/Timeline/Tween.reel')
| -rw-r--r-- | js/panels/Timeline/Tween.reel/Tween.html | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/js/panels/Timeline/Tween.reel/Tween.html b/js/panels/Timeline/Tween.reel/Tween.html index 3e72acc0..307dcd02 100644 --- a/js/panels/Timeline/Tween.reel/Tween.html +++ b/js/panels/Timeline/Tween.reel/Tween.html | |||
| @@ -28,7 +28,8 @@ | |||
| 28 | "module": "js/panels/Timeline/Keyframe.reel", | 28 | "module": "js/panels/Timeline/Keyframe.reel", |
| 29 | "name": "Keyframe", | 29 | "name": "Keyframe", |
| 30 | "properties": { | 30 | "properties": { |
| 31 | "element": {"#": "keyframe_container"} | 31 | "element": {"#": "keyframe_container"}, |
| 32 | "containingSpan": {"@": "span"} | ||
| 32 | } | 33 | } |
| 33 | } | 34 | } |
| 34 | } | 35 | } |