aboutsummaryrefslogtreecommitdiff
path: root/js/components/toolbar.reel
diff options
context:
space:
mode:
authorKruti Shah2012-06-27 09:25:42 -0700
committerKruti Shah2012-06-27 09:25:42 -0700
commitd6bffa2450f68bdf9bfff0f4e155778f59f3624a (patch)
treec37300f67a3fb502d7f4e277600944739d48fd82 /js/components/toolbar.reel
parentb52747edbeba7d210fca98acccb2d2df52134bca (diff)
parent46174eb0ce93d660c8d2e9276fbdc4f9a03f056a (diff)
downloadninja-d6bffa2450f68bdf9bfff0f4e155778f59f3624a.tar.gz
Merge branch 'refs/heads/ninjainternalmaster' into Timeline-local-kruti
Diffstat (limited to 'js/components/toolbar.reel')
-rw-r--r--js/components/toolbar.reel/toolbar.html3
1 files changed, 1 insertions, 2 deletions
diff --git a/js/components/toolbar.reel/toolbar.html b/js/components/toolbar.reel/toolbar.html
index 51e7ebec..c23e082f 100644
--- a/js/components/toolbar.reel/toolbar.html
+++ b/js/components/toolbar.reel/toolbar.html
@@ -19,8 +19,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
19 }, 19 },
20 20
21 "buttonList": { 21 "buttonList": {
22 "module": "montage/ui/repetition.reel", 22 "prototype" : "montage/ui/repetition.reel",
23 "name": "Repetition",
24 "properties": { 23 "properties": {
25 "element": {"#": "repetition"} 24 "element": {"#": "repetition"}
26 }, 25 },