diff options
| author | Armen Kesablyan | 2012-05-09 09:28:03 -0700 |
|---|---|---|
| committer | Armen Kesablyan | 2012-05-09 09:28:03 -0700 |
| commit | e3efa52c409ef05c28bfc5f1f25a750b5132c3bd (patch) | |
| tree | 86c321680783c228bb7d5de2b904b65ace111066 /js | |
| parent | dc075ffcc6dd03c090d90fad999eee9b924d56ee (diff) | |
| download | ninja-e3efa52c409ef05c28bfc5f1f25a750b5132c3bd.tar.gz | |
After merge file change
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js')
| -rwxr-xr-x | js/components/layout/tools-properties.reel/tools-properties.html | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/js/components/layout/tools-properties.reel/tools-properties.html b/js/components/layout/tools-properties.reel/tools-properties.html index 112cfcb0..9061cd12 100755 --- a/js/components/layout/tools-properties.reel/tools-properties.html +++ b/js/components/layout/tools-properties.reel/tools-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/> |
| @@ -195,6 +195,7 @@ | |||
| 195 | <div data-montage-id="rotateStageProperties"></div> | 195 | <div data-montage-id="rotateStageProperties"></div> |
| 196 | <div data-montage-id="panProperties"></div> | 196 | <div data-montage-id="panProperties"></div> |
| 197 | <div data-montage-id="zoomProperties"></div> | 197 | <div data-montage-id="zoomProperties"></div> |
| 198 | <div data-montage-id="bindingProperties"></div> | ||
| 198 | <div data-montage-id="disabledCondition" class="panelDisabled"></div> | 199 | <div data-montage-id="disabledCondition" class="panelDisabled"></div> |
| 199 | </div> | 200 | </div> |
| 200 | </body> | 201 | </body> |