diff options
| author | Jon Reid | 2012-06-26 14:58:10 -0700 |
|---|---|---|
| committer | Jon Reid | 2012-06-26 14:58:10 -0700 |
| commit | 2599f74d72293b809929d8a0b36fb8e721f194cd (patch) | |
| tree | ca4cd45b23b8debea32f95d7dea807c77b6633b2 /js/components/layout/tools-list.reel | |
| parent | ab9d14780eed98f39786fae4518e69861b34bad7 (diff) | |
| parent | e4304b9ac6c58802de4dd334be1f5802533f5160 (diff) | |
| download | ninja-2599f74d72293b809929d8a0b36fb8e721f194cd.tar.gz | |
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local
Diffstat (limited to 'js/components/layout/tools-list.reel')
| -rwxr-xr-x | js/components/layout/tools-list.reel/tools-list.html | 11 |
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 | } |