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/layout/tools-properties.reel/tools-properties.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/layout/tools-properties.reel/tools-properties.html')
| -rwxr-xr-x | js/components/layout/tools-properties.reel/tools-properties.html | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/js/components/layout/tools-properties.reel/tools-properties.html b/js/components/layout/tools-properties.reel/tools-properties.html index f51bce10..5dc83881 100755 --- a/js/components/layout/tools-properties.reel/tools-properties.html +++ b/js/components/layout/tools-properties.reel/tools-properties.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. |
| @@ -146,7 +146,7 @@ POSSIBILITY OF SUCH DAMAGE. | |||
| 146 | } | 146 | } |
| 147 | } | 147 | } |
| 148 | }, | 148 | }, |
| 149 | 149 | ||
| 150 | "owner": { | 150 | "owner": { |
| 151 | "prototype": "js/components/layout/tools-properties.reel", | 151 | "prototype": "js/components/layout/tools-properties.reel", |
| 152 | "properties": { | 152 | "properties": { |
| @@ -165,7 +165,7 @@ POSSIBILITY OF SUCH DAMAGE. | |||
| 165 | "rotateStageProperties": {"@": "rotateStageProperties"}, | 165 | "rotateStageProperties": {"@": "rotateStageProperties"}, |
| 166 | "panProperties": {"@": "panProperties"}, | 166 | "panProperties": {"@": "panProperties"}, |
| 167 | "zoomProperties": {"@": "zoomProperties"}, | 167 | "zoomProperties": {"@": "zoomProperties"}, |
| 168 | "bindingProperties": {"@": "bindingProperties"} | 168 | "bindingProperties": {"@": "bindingProperties"} |
| 169 | }, | 169 | }, |
| 170 | "bindings": { | 170 | "bindings": { |
| 171 | "currentSelectedTool": { | 171 | "currentSelectedTool": { |
| @@ -175,9 +175,9 @@ POSSIBILITY OF SUCH DAMAGE. | |||
| 175 | } | 175 | } |
| 176 | } | 176 | } |
| 177 | } | 177 | } |
| 178 | } | 178 | } |
| 179 | </script> | 179 | </script> |
| 180 | 180 | ||
| 181 | </head> | 181 | </head> |
| 182 | 182 | ||
| 183 | <body> | 183 | <body> |