diff options
| author | Valerio Virgillito | 2012-07-09 14:35:44 -0700 |
|---|---|---|
| committer | Valerio Virgillito | 2012-07-09 14:35:44 -0700 |
| commit | 84b3327bd92faafab7954b5eb64c7abe24a3fe13 (patch) | |
| tree | 3f56cbed2f08c5a81ea79eaf0bcb9bd031d8a627 /js/components/popup-manager.reel/popup-manager.html | |
| parent | c0a42c56f768a873ba637f5b86d5f6a84d4a3312 (diff) | |
| parent | 40c6eb2c06b34f65a74d59ef9687251952858bab (diff) | |
| download | ninja-84b3327bd92faafab7954b5eb64c7abe24a3fe13.tar.gz | |
Merge branch 'normalize' of https://github.com/kriskowal/ninja-internal
Conflicts:
js/components/gradientpicker.reel/gradientpicker.js
js/components/tools-properties/text-properties.reel/text-properties.js
js/document/views/base.js
js/document/views/design.js
js/helper-classes/3D/StageLine.js
js/helper-classes/3D/draw-utils.js
js/lib/drawing/world.js
js/lib/geom/circle.js
js/lib/geom/line.js
js/lib/geom/rectangle.js
js/lib/geom/shape-primitive.js
js/lib/rdge/materials/bump-metal-material.js
js/lib/rdge/materials/flag-material.js
js/lib/rdge/materials/fly-material.js
js/lib/rdge/materials/julia-material.js
js/lib/rdge/materials/keleidoscope-material.js
js/lib/rdge/materials/mandel-material.js
js/lib/rdge/materials/material.js
js/lib/rdge/materials/plasma-material.js
js/lib/rdge/materials/pulse-material.js
js/lib/rdge/materials/radial-gradient-material.js
js/lib/rdge/materials/taper-material.js
js/lib/rdge/materials/twist-vert-material.js
js/lib/rdge/materials/water-material.js
js/panels/Materials/materials-library-panel.reel/materials-library-panel.html
js/panels/Materials/materials-library-panel.reel/materials-library-panel.js
js/panels/Materials/materials-popup.reel/materials-popup.html
js/panels/Materials/materials-popup.reel/materials-popup.js
js/tools/LineTool.js
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/components/popup-manager.reel/popup-manager.html')
| -rwxr-xr-x | js/components/popup-manager.reel/popup-manager.html | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/js/components/popup-manager.reel/popup-manager.html b/js/components/popup-manager.reel/popup-manager.html index 281477f1..09901f03 100755 --- a/js/components/popup-manager.reel/popup-manager.html +++ b/js/components/popup-manager.reel/popup-manager.html | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | <!DOCTYPE html> | 1 | <!doctype html> |
| 2 | <!-- | 2 | <!-- |
| 3 | <copyright> | 3 | <copyright> |
| 4 | Copyright (c) 2012, Motorola Mobility, Inc | 4 | Copyright (c) 2012, Motorola Mobility, Inc |
| 5 | All Rights Reserved. | 5 | All Rights Reserved. |
| @@ -31,10 +31,10 @@ POSSIBILITY OF SUCH DAMAGE. | |||
| 31 | </copyright> | 31 | </copyright> |
| 32 | --> | 32 | --> |
| 33 | <html lang="en"> | 33 | <html lang="en"> |
| 34 | <head> | 34 | <head> |
| 35 | 35 | ||
| 36 | <meta http-equiv="content-type" content="text/html; charset=utf-8" /> | 36 | <meta http-equiv="content-type" content="text/html; charset=utf-8" /> |
| 37 | 37 | ||
| 38 | <script type="text/montage-serialization"> | 38 | <script type="text/montage-serialization"> |
| 39 | { | 39 | { |
| 40 | "owner": { | 40 | "owner": { |
| @@ -45,13 +45,13 @@ POSSIBILITY OF SUCH DAMAGE. | |||
| 45 | } | 45 | } |
| 46 | } | 46 | } |
| 47 | </script> | 47 | </script> |
| 48 | 48 | ||
| 49 | </head> | 49 | </head> |
| 50 | 50 | ||
| 51 | <body> | 51 | <body> |
| 52 | 52 | ||
| 53 | <section data-montage-id="popupWindows"></section> | 53 | <section data-montage-id="popupWindows"></section> |
| 54 | 54 | ||
| 55 | </body> | 55 | </body> |
| 56 | 56 | ||
| 57 | </html> | 57 | </html> |