diff options
author | hwc487 | 2012-06-13 14:04:09 -0700 |
---|---|---|
committer | hwc487 | 2012-06-13 14:04:09 -0700 |
commit | 3e481dd581e0305dd8b572ed0d17e86622223464 (patch) | |
tree | aca2b28aa72857a52e047fb94090c34ab8dd1c2c /js/components/layout/tools-list.reel/tools-list.html | |
parent | a7aa51e6b91623772eef54b827616432838b560e (diff) | |
parent | 682f4917d6badd105998c3dd84d031c38b51f017 (diff) | |
download | ninja-3e481dd581e0305dd8b572ed0d17e86622223464.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Diffstat (limited to 'js/components/layout/tools-list.reel/tools-list.html')
-rwxr-xr-x | js/components/layout/tools-list.reel/tools-list.html | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/js/components/layout/tools-list.reel/tools-list.html b/js/components/layout/tools-list.reel/tools-list.html index 4e5b85ee..3a9661f5 100755 --- a/js/components/layout/tools-list.reel/tools-list.html +++ b/js/components/layout/tools-list.reel/tools-list.html | |||
@@ -126,10 +126,7 @@ | |||
126 | "EraserTool": {"@": "EraserTool1"}, | 126 | "EraserTool": {"@": "EraserTool1"}, |
127 | "RotateStageTool3D": {"@": "RotateStageTool3D1"}, | 127 | "RotateStageTool3D": {"@": "RotateStageTool3D1"}, |
128 | "PanTool": {"@": "PanTool1"}, | 128 | "PanTool": {"@": "PanTool1"}, |
129 | "ZoomTool": {"@": "ZoomTool1"}, | 129 | "ZoomTool": {"@": "ZoomTool1"} |
130 | "components": [ | ||
131 | {"@": "repetition1"} | ||
132 | ] | ||
133 | } | 130 | } |
134 | } | 131 | } |
135 | } | 132 | } |