diff options
| author | Eric Guzman | 2012-04-30 13:48:43 -0700 |
|---|---|---|
| committer | Eric Guzman | 2012-04-30 13:48:43 -0700 |
| commit | 23d8efd4ed9e8fd43f516595009679fb44c8096d (patch) | |
| tree | 7d5be06e6417102702a49ece24fca82528aced7a /js/components/tools-properties/object3d-properties.reel | |
| parent | ae94b22c27b9b155e94bf140631e7faf8f55c6c0 (diff) | |
| parent | c8fac64d4ad8ac18744a17a5e0f0d17204355fd6 (diff) | |
| download | ninja-23d8efd4ed9e8fd43f516595009679fb44c8096d.tar.gz | |
Merge branch 'refs/heads/master' into CSSPanelUpdates
Diffstat (limited to 'js/components/tools-properties/object3d-properties.reel')
| -rwxr-xr-x | js/components/tools-properties/object3d-properties.reel/object3d-properties.html | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/js/components/tools-properties/object3d-properties.reel/object3d-properties.html b/js/components/tools-properties/object3d-properties.reel/object3d-properties.html index 3f882850..58c29db5 100755 --- a/js/components/tools-properties/object3d-properties.reel/object3d-properties.html +++ b/js/components/tools-properties/object3d-properties.reel/object3d-properties.html | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | <!DOCTYPE HTML> | 1 | <!DOCTYPE HTML> |
| 2 | <!-- <copyright> | 2 | <!-- <copyright> |
| 3 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | 3 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> |
| 4 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | 4 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> |
| @@ -14,8 +14,7 @@ | |||
| 14 | { | 14 | { |
| 15 | 15 | ||
| 16 | "owner": { | 16 | "owner": { |
| 17 | "module": "js/components/tools-properties/object3d-properties.reel", | 17 | "prototype": "js/components/tools-properties/object3d-properties.reel[Object3DProperties]", |
| 18 | "name": "Object3DProperties", | ||
| 19 | "properties": { | 18 | "properties": { |
| 20 | "element": {"#": "object3DProperties"}, | 19 | "element": {"#": "object3DProperties"}, |
| 21 | 20 | ||