diff options
| author | Armen Kesablyan | 2012-05-08 16:43:43 -0700 |
|---|---|---|
| committer | Armen Kesablyan | 2012-05-08 16:43:43 -0700 |
| commit | dc075ffcc6dd03c090d90fad999eee9b924d56ee (patch) | |
| tree | 867f8bdd588c8f9076979233ca46a688ff70523e /js/panels/Timeline/Tween.reel/Tween.html | |
| parent | 5d7e470351fd150d5e70a97332fa2f2553797499 (diff) | |
| parent | 4d949f141247215b5f2a6ec0cfc7d2d31cf2bb1f (diff) | |
| download | ninja-dc075ffcc6dd03c090d90fad999eee9b924d56ee.tar.gz | |
Merge branch 'refs/heads/dom-architecture' into binding
Conflicts:
js/components/layout/tools-properties.reel/tools-properties.html
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/panels/Timeline/Tween.reel/Tween.html')
| -rw-r--r-- | js/panels/Timeline/Tween.reel/Tween.html | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/js/panels/Timeline/Tween.reel/Tween.html b/js/panels/Timeline/Tween.reel/Tween.html index c161b3f8..aba42436 100644 --- a/js/panels/Timeline/Tween.reel/Tween.html +++ b/js/panels/Timeline/Tween.reel/Tween.html | |||
| @@ -37,9 +37,9 @@ | |||
| 37 | </head> | 37 | </head> |
| 38 | <body> | 38 | <body> |
| 39 | 39 | ||
| 40 | <div id="tweenspace" class="tween_container"> | 40 | <div data-montage-id="tweenspace" class="tween_container"> |
| 41 | <div id="span_container"></div> | 41 | <div data-montage-id="span_container"></div> |
| 42 | <div id="keyframe_container"></div> | 42 | <div data-montage-id="keyframe_container"></div> |
| 43 | </div> | 43 | </div> |
| 44 | 44 | ||
| 45 | </body> | 45 | </body> |