diff options
| author | hwc487 | 2012-07-09 16:08:02 -0700 |
|---|---|---|
| committer | hwc487 | 2012-07-09 16:08:02 -0700 |
| commit | 5085d0f67df89a21715308956004164597a6ba79 (patch) | |
| tree | 2c896163143a66331205a39b0a3b1b45d51bf12a /js/panels/Timeline/Tween.reel/Tween.html | |
| parent | 51f1691f792dbda9b740ded8aa0457c9406db156 (diff) | |
| parent | 84b3327bd92faafab7954b5eb64c7abe24a3fe13 (diff) | |
| download | ninja-5085d0f67df89a21715308956004164597a6ba79.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into GridFixes
Conflicts:
js/helper-classes/3D/StageLine.js
Diffstat (limited to 'js/panels/Timeline/Tween.reel/Tween.html')
| -rw-r--r-- | js/panels/Timeline/Tween.reel/Tween.html | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/js/panels/Timeline/Tween.reel/Tween.html b/js/panels/Timeline/Tween.reel/Tween.html index e27aeb89..0ae6c73b 100644 --- a/js/panels/Timeline/Tween.reel/Tween.html +++ b/js/panels/Timeline/Tween.reel/Tween.html | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | <!DOCTYPE html> | 1 | <!doctype html> |
| 2 | <!-- <copyright> | 2 | <!-- <copyright> |
| 3 | Copyright (c) 2012, Motorola Mobility, Inc | 3 | Copyright (c) 2012, Motorola Mobility, Inc |
| 4 | All Rights Reserved. | 4 | All Rights Reserved. |
| @@ -29,9 +29,9 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | |||
| 29 | POSSIBILITY OF SUCH DAMAGE. | 29 | POSSIBILITY OF SUCH DAMAGE. |
| 30 | </copyright> --> | 30 | </copyright> --> |
| 31 | <html lang="en"> | 31 | <html lang="en"> |
| 32 | <head> | 32 | <head> |
| 33 | <meta http-equiv="content-type" content="text/html; charset=utf-8" /> | 33 | <meta http-equiv="content-type" content="text/html; charset=utf-8" /> |
| 34 | <link rel="stylesheet" type="text/css" href="css/Tween.css"> | 34 | <link rel="stylesheet" type="text/css" href="css/Tween.css"> |
| 35 | <script type="text/montage-serialization"> | 35 | <script type="text/montage-serialization"> |
| 36 | { | 36 | { |
| 37 | "owner": { | 37 | "owner": { |
| @@ -42,7 +42,7 @@ POSSIBILITY OF SUCH DAMAGE. | |||
| 42 | "tweenspan": {"@": "span"} | 42 | "tweenspan": {"@": "span"} |
| 43 | } | 43 | } |
| 44 | }, | 44 | }, |
| 45 | 45 | ||
| 46 | "span": { | 46 | "span": { |
| 47 | "prototype": "js/panels/Timeline/Span.reel", | 47 | "prototype": "js/panels/Timeline/Span.reel", |
| 48 | "properties": { | 48 | "properties": { |
| @@ -58,8 +58,8 @@ POSSIBILITY OF SUCH DAMAGE. | |||
| 58 | } | 58 | } |
| 59 | } | 59 | } |
| 60 | </script> | 60 | </script> |
| 61 | </head> | 61 | </head> |
| 62 | <body> | 62 | <body> |
| 63 | 63 | ||
| 64 | <div data-montage-id="tweenspace" class="tween_container"> | 64 | <div data-montage-id="tweenspace" class="tween_container"> |
| 65 | <div data-montage-id="span_container"></div> | 65 | <div data-montage-id="span_container"></div> |