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/components/tools-properties/selection-properties.reel | |
| 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/components/tools-properties/selection-properties.reel')
| -rwxr-xr-x | js/components/tools-properties/selection-properties.reel/selection-properties.html | 6 |
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> |
| 3 | Copyright (c) 2012, Motorola Mobility, Inc | 3 | Copyright (c) 2012, Motorola Mobility, Inc |
| 4 | All Rights Reserved. | 4 | All 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> |