diff options
| author | hwc487 | 2012-02-23 15:21:56 -0800 |
|---|---|---|
| committer | hwc487 | 2012-02-23 15:21:56 -0800 |
| commit | 26bb2894c29d4608e843de01829d352dd3d00823 (patch) | |
| tree | c5a9d10976304fe5b3dec59f40977d8c72df57de /js/panels/Timeline/Span.reel/Span.html | |
| parent | 64280907f31e6f6e5659acb0893df3e0da5bb044 (diff) | |
| parent | 81ce79819ba574b03b46e91e9a153dab82b550cd (diff) | |
| download | ninja-26bb2894c29d4608e843de01829d352dd3d00823.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into integration
Conflicts:
js/helper-classes/RDGE/GLWorld.js
js/helper-classes/RDGE/Materials/PulseMaterial.js
js/helper-classes/RDGE/Materials/RadialBlurMaterial.js
js/helper-classes/RDGE/src/tools/rdge-compiled.js
js/preloader/Preloader.js
Diffstat (limited to 'js/panels/Timeline/Span.reel/Span.html')
| -rw-r--r-- | js/panels/Timeline/Span.reel/Span.html | 6 |
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> |