aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties/selection-properties.reel/selection-properties.html
diff options
context:
space:
mode:
authorhwc4872012-04-27 14:35:46 -0700
committerhwc4872012-04-27 14:35:46 -0700
commit1a92b93994cd90abc8df61b7a1e5cfc1f65a19ce (patch)
tree3853b15ca684a7bdc7e7a8bdb7935be61ff85671 /js/components/tools-properties/selection-properties.reel/selection-properties.html
parent5a1965bf2ed9a54601ca16fd67555335c510ce08 (diff)
parentc8fac64d4ad8ac18744a17a5e0f0d17204355fd6 (diff)
downloadninja-1a92b93994cd90abc8df61b7a1e5cfc1f65a19ce.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Diffstat (limited to 'js/components/tools-properties/selection-properties.reel/selection-properties.html')
-rwxr-xr-xjs/components/tools-properties/selection-properties.reel/selection-properties.html3
1 files changed, 1 insertions, 2 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 261a0177..f0b907af 100755
--- a/js/components/tools-properties/selection-properties.reel/selection-properties.html
+++ b/js/components/tools-properties/selection-properties.reel/selection-properties.html
@@ -13,8 +13,7 @@
13 { 13 {
14 14
15 "owner": { 15 "owner": {
16 "module": "js/components/tools-properties/selection-properties.reel", 16 "prototype": "js/components/tools-properties/selection-properties.reel",
17 "name": "SelectionProperties",
18 "properties": { 17 "properties": {
19 "element": {"#": "selectionProperties"}, 18 "element": {"#": "selectionProperties"},
20 "transform": {"#": "transformCheck"} 19 "transform": {"#": "transformCheck"}