aboutsummaryrefslogtreecommitdiff
path: root/js/components/toolbar.reel
diff options
context:
space:
mode:
authorJonathan Duran2012-06-26 13:28:59 -0700
committerJonathan Duran2012-06-26 13:28:59 -0700
commit42ea74de49cc9f06d8231b99c2ee6c65b0f8a61a (patch)
treead15f365ffae331ae76060a1ebdfc0f0f029725a /js/components/toolbar.reel
parentcdb5af99be5fca15265e4940dd22870f4c5fef4b (diff)
parent87a8b62f71bb72274c3dd1fa389e88c12d482ebb (diff)
downloadninja-42ea74de49cc9f06d8231b99c2ee6c65b0f8a61a.tar.gz
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
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 },