diff options
| author | Ananya Sen | 2012-07-09 16:52:49 -0700 |
|---|---|---|
| committer | Ananya Sen | 2012-07-09 16:52:49 -0700 |
| commit | 2eb84584f44b8c774479d1af2ee1d810597474cf (patch) | |
| tree | 64cb3e09a8daeb340261dd7f3869c73f7b90b643 /js/components/tools-properties/object3d-properties.reel/object3d-properties.html | |
| parent | bf9dba001ec84243e2f12cd13b0c0ae020fba4a2 (diff) | |
| parent | cee0deca695359ab468bd06d0e05ed3b2010b338 (diff) | |
| download | ninja-2eb84584f44b8c774479d1af2ee1d810597474cf.tar.gz | |
Merge branch 'refs/heads/ninja-internal-master' into codemirror-custom-theme-removal
Conflicts:
js/code-editor/codemirror-ninja/theme/lesser-dark-ninja.css
js/code-editor/codemirror-ninja/theme/xq-dark-ninja.css
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/components/tools-properties/object3d-properties.reel/object3d-properties.html')
| -rwxr-xr-x | js/components/tools-properties/object3d-properties.reel/object3d-properties.html | 29 |
1 files changed, 15 insertions, 14 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 93d1abfe..191f5695 100755 --- a/js/components/tools-properties/object3d-properties.reel/object3d-properties.html +++ b/js/components/tools-properties/object3d-properties.reel/object3d-properties.html | |||
| @@ -1,25 +1,26 @@ | |||
| 1 | <!DOCTYPE HTML> | 1 | <!doctype html> |
| 2 | <!-- <copyright> | 2 | <!-- <copyright> |
| 3 | Copyright (c) 2012, Motorola Mobility, Inc | 3 | Copyright (c) 2012, Motorola Mobility LLC. |
| 4 | All Rights Reserved. | 4 | All Rights Reserved. |
| 5 | BSD License. | ||
| 6 | 5 | ||
| 7 | Redistribution and use in source and binary forms, with or without | 6 | Redistribution and use in source and binary forms, with or without |
| 8 | modification, are permitted provided that the following conditions are met: | 7 | modification, are permitted provided that the following conditions are met: |
| 9 | 8 | ||
| 10 | - Redistributions of source code must retain the above copyright notice, | 9 | * Redistributions of source code must retain the above copyright notice, |
| 11 | this list of conditions and the following disclaimer. | 10 | this list of conditions and the following disclaimer. |
| 12 | - Redistributions in binary form must reproduce the above copyright | 11 | |
| 13 | notice, this list of conditions and the following disclaimer in the | 12 | * Redistributions in binary form must reproduce the above copyright notice, |
| 14 | documentation and/or other materials provided with the distribution. | 13 | this list of conditions and the following disclaimer in the documentation |
| 15 | - Neither the name of Motorola Mobility nor the names of its contributors | 14 | and/or other materials provided with the distribution. |
| 16 | may be used to endorse or promote products derived from this software | 15 | |
| 17 | without specific prior written permission. | 16 | * Neither the name of Motorola Mobility LLC nor the names of its |
| 17 | contributors may be used to endorse or promote products derived from this | ||
| 18 | software without specific prior written permission. | ||
| 18 | 19 | ||
| 19 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | 20 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" |
| 20 | AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 21 | AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
| 21 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | 22 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
| 22 | ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE | 23 | ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE |
| 23 | LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | 24 | LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR |
| 24 | CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | 25 | CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF |
| 25 | SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | 26 | SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS |
| @@ -47,8 +48,8 @@ POSSIBILITY OF SUCH DAMAGE. | |||
| 47 | 48 | ||
| 48 | } | 49 | } |
| 49 | } | 50 | } |
| 50 | } | 51 | } |
| 51 | </script> | 52 | </script> |
| 52 | 53 | ||
| 53 | </head> | 54 | </head> |
| 54 | 55 | ||