aboutsummaryrefslogtreecommitdiff
path: root/js/components/layout/tools-list.reel/tools-list.html
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-06-13 14:03:00 -0700
committerJose Antonio Marquez2012-06-13 14:03:00 -0700
commitefbe5f83157a8dcbcc209c88877d9cd0113d4d20 (patch)
tree50565e097fe4a9db59e554af179f66938fa59f1c /js/components/layout/tools-list.reel/tools-list.html
parentae90152ae2889a10d44c22e1eeb5bff16cc44a19 (diff)
parent682f4917d6badd105998c3dd84d031c38b51f017 (diff)
downloadninja-efbe5f83157a8dcbcc209c88877d9cd0113d4d20.tar.gz
Merge branch 'refs/heads/Ninja-Internal' into Color
Diffstat (limited to 'js/components/layout/tools-list.reel/tools-list.html')
-rwxr-xr-xjs/components/layout/tools-list.reel/tools-list.html5
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 }