aboutsummaryrefslogtreecommitdiff
path: root/js/components/toolbar.reel/toolbar.html
diff options
context:
space:
mode:
authorValerio Virgillito2012-05-31 11:06:43 -0700
committerValerio Virgillito2012-05-31 11:06:43 -0700
commit19e3d87a8428a44c9edf3df47998c3bfe93b3c90 (patch)
tree707e789f7e9af3568b262ef3ab113175f0629484 /js/components/toolbar.reel/toolbar.html
parentd04aa0b195826b3b3c70f68aa8aba1be9e30a648 (diff)
parent6042bdc5f2aada4412912fd01602d32c9088dc26 (diff)
downloadninja-19e3d87a8428a44c9edf3df47998c3bfe93b3c90.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into document-bindings-fix
Diffstat (limited to 'js/components/toolbar.reel/toolbar.html')
-rw-r--r--js/components/toolbar.reel/toolbar.html2
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": " "