aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties/selection-properties.reel
diff options
context:
space:
mode:
authorValerio Virgillito2012-07-09 14:35:44 -0700
committerValerio Virgillito2012-07-09 14:35:44 -0700
commit84b3327bd92faafab7954b5eb64c7abe24a3fe13 (patch)
tree3f56cbed2f08c5a81ea79eaf0bcb9bd031d8a627 /js/components/tools-properties/selection-properties.reel
parentc0a42c56f768a873ba637f5b86d5f6a84d4a3312 (diff)
parent40c6eb2c06b34f65a74d59ef9687251952858bab (diff)
downloadninja-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/tools-properties/selection-properties.reel')
-rwxr-xr-xjs/components/tools-properties/selection-properties.reel/selection-properties.html6
1 files changed, 3 insertions, 3 deletions
diff --git a/js/components/tools-properties/selection-properties.reel/selection-properties.html b/js/components/tools-properties/selection-properties.reel/selection-properties.html
index c94c0b6d..ff80a1d9 100755
--- a/js/components/tools-properties/selection-properties.reel/selection-properties.html
+++ b/js/components/tools-properties/selection-properties.reel/selection-properties.html
@@ -1,4 +1,4 @@
1<!DOCTYPE HTML> 1<!doctype html>
2<!-- <copyright> 2<!-- <copyright>
3Copyright (c) 2012, Motorola Mobility, Inc 3Copyright (c) 2012, Motorola Mobility, Inc
4All Rights Reserved. 4All Rights Reserved.
@@ -41,7 +41,7 @@ POSSIBILITY OF SUCH DAMAGE.
41 "properties": { 41 "properties": {
42 "element": {"#": "selectionProperties"}, 42 "element": {"#": "selectionProperties"},
43 "transform": {"#": "transformCheck"}, 43 "transform": {"#": "transformCheck"},
44 44
45 "topAlign": {"#": "topAlignBtn"}, 45 "topAlign": {"#": "topAlignBtn"},
46 "middleAlign": {"#": "middleAlignBtn"}, 46 "middleAlign": {"#": "middleAlignBtn"},
47 "bottomAlign": {"#": "bottomAlignBtn"}, 47 "bottomAlign": {"#": "bottomAlignBtn"},
@@ -64,7 +64,7 @@ POSSIBILITY OF SUCH DAMAGE.
64 "arrangeSendToBack": {"#": "arrangeSendToBackBtn"} 64 "arrangeSendToBack": {"#": "arrangeSendToBackBtn"}
65 } 65 }
66 } 66 }
67 } 67 }
68 </script> 68 </script>
69 69
70 </head> 70 </head>