aboutsummaryrefslogtreecommitdiff
path: root/js/components/layout/tools-list.reel/tools-list.html
diff options
context:
space:
mode:
authorAnanya Sen2012-06-26 16:07:00 -0700
committerAnanya Sen2012-06-26 16:07:00 -0700
commit1d5372534d11c9c1b818ba5e7d67498c731e9ac6 (patch)
treebc09c9f08ac2faa955995a91a78337276a81eb77 /js/components/layout/tools-list.reel/tools-list.html
parent3391a8e6fd5df0d464edaffd98c2b3fde23acf5a (diff)
parent46174eb0ce93d660c8d2e9276fbdc4f9a03f056a (diff)
downloadninja-1d5372534d11c9c1b818ba5e7d67498c731e9ac6.tar.gz
Merge branch 'refs/heads/ninja-internal-master' into bugfix-master
Conflicts: js/ninja.reel/ninja.html Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/components/layout/tools-list.reel/tools-list.html')
-rwxr-xr-xjs/components/layout/tools-list.reel/tools-list.html11
1 files changed, 9 insertions, 2 deletions
diff --git a/js/components/layout/tools-list.reel/tools-list.html b/js/components/layout/tools-list.reel/tools-list.html
index 3a9661f5..5b175f49 100755
--- a/js/components/layout/tools-list.reel/tools-list.html
+++ b/js/components/layout/tools-list.reel/tools-list.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/>
@@ -95,6 +95,9 @@
95 "ZoomTool1": { 95 "ZoomTool1": {
96 "prototype": "js/tools/ZoomTool" 96 "prototype": "js/tools/ZoomTool"
97 }, 97 },
98 "BindingTool1": {
99 "prototype": "js/tools/BindingTool"
100 },
98 101
99 "disable": { 102 "disable": {
100 "prototype": "montage/ui/condition.reel", 103 "prototype": "montage/ui/condition.reel",
@@ -126,7 +129,11 @@
126 "EraserTool": {"@": "EraserTool1"}, 129 "EraserTool": {"@": "EraserTool1"},
127 "RotateStageTool3D": {"@": "RotateStageTool3D1"}, 130 "RotateStageTool3D": {"@": "RotateStageTool3D1"},
128 "PanTool": {"@": "PanTool1"}, 131 "PanTool": {"@": "PanTool1"},
129 "ZoomTool": {"@": "ZoomTool1"} 132 "ZoomTool": {"@": "ZoomTool1"},
133 "bindingTool": {"@": "BindingTool1"},
134 "components": [
135 {"@": "repetition1"}
136 ]
130 } 137 }
131 } 138 }
132 } 139 }