diff options
author | Jose Antonio Marquez | 2012-05-31 15:39:41 -0700 |
---|---|---|
committer | Jose Antonio Marquez | 2012-05-31 15:39:41 -0700 |
commit | 9c961c9ef3819f3a8e825f12ab8f5ed8507f9b18 (patch) | |
tree | 90e7217f3c8086f9bdaac6ef4826fb14fc72ae43 /js/components/toolbar.reel/toolbar.html | |
parent | 0ed38667daa2466963d940f2a3cec0b06743ac5d (diff) | |
parent | 6042bdc5f2aada4412912fd01602d32c9088dc26 (diff) | |
download | ninja-9c961c9ef3819f3a8e825f12ab8f5ed8507f9b18.tar.gz |
Merge branch 'refs/heads/Ninja-Internal' into Document
Diffstat (limited to 'js/components/toolbar.reel/toolbar.html')
-rw-r--r-- | js/components/toolbar.reel/toolbar.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/components/toolbar.reel/toolbar.html b/js/components/toolbar.reel/toolbar.html index d2c5972a..51e7ebec 100644 --- a/js/components/toolbar.reel/toolbar.html +++ b/js/components/toolbar.reel/toolbar.html | |||
@@ -30,7 +30,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
30 | }, | 30 | }, |
31 | 31 | ||
32 | "button": { | 32 | "button": { |
33 | "prototype": "montage/ui/button.reel", | 33 | "prototype": "js/components/toolbar.reel/toolbar-button", |
34 | "properties": { | 34 | "properties": { |
35 | "element": {"#": "button" }, | 35 | "element": {"#": "button" }, |
36 | "label": " " | 36 | "label": " " |