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/presets/content.reel/content.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/presets/content.reel/content.html')
| -rw-r--r-- | js/panels/presets/content.reel/content.html | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/js/panels/presets/content.reel/content.html b/js/panels/presets/content.reel/content.html index 6d8b053a..ddd1981a 100644 --- a/js/panels/presets/content.reel/content.html +++ b/js/panels/presets/content.reel/content.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. |
| @@ -30,7 +30,7 @@ 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" href="content.css" type="text/css"> | 34 | <link rel="stylesheet" href="content.css" type="text/css"> |
| 35 | <script type="text/montage-serialization"> | 35 | <script type="text/montage-serialization"> |
| 36 | { | 36 | { |
| @@ -75,8 +75,8 @@ POSSIBILITY OF SUCH DAMAGE. | |||
| 75 | "prototype": "js/panels/presets/animations-presets.reel[AnimationsLibrary]" | 75 | "prototype": "js/panels/presets/animations-presets.reel[AnimationsLibrary]" |
| 76 | } | 76 | } |
| 77 | 77 | ||
| 78 | } | 78 | } |
| 79 | </script> | 79 | </script> |
| 80 | </head> | 80 | </head> |
| 81 | <body> | 81 | <body> |
| 82 | <section data-montage-id="presetsPanel" class="presetsPanel"> | 82 | <section data-montage-id="presetsPanel" class="presetsPanel"> |