diff options
author | Armen Kesablyan | 2012-06-20 15:16:30 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-06-20 15:16:30 -0700 |
commit | 65b989c7759af923fb9456d34bff89f91831ea1e (patch) | |
tree | e408be732a3eee71229bfc7dbf7cace998ce18de /js/components/layout/bread-crumb.reel/bread-crumb.html | |
parent | 38f571d1fdf02d36c3816637af7b2ca2493809da (diff) | |
parent | fc818d31de267d2b77fda3b3029ad38d48698be8 (diff) | |
download | ninja-65b989c7759af923fb9456d34bff89f91831ea1e.tar.gz |
Merge branch 'refs/heads/master' into binding
Conflicts:
node_modules/montage/ui/application.js
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/components/layout/bread-crumb.reel/bread-crumb.html')
-rwxr-xr-x | js/components/layout/bread-crumb.reel/bread-crumb.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.html b/js/components/layout/bread-crumb.reel/bread-crumb.html index 68f3be2b..ee314628 100755 --- a/js/components/layout/bread-crumb.reel/bread-crumb.html +++ b/js/components/layout/bread-crumb.reel/bread-crumb.html | |||
@@ -21,7 +21,7 @@ | |||
21 | }, | 21 | }, |
22 | 22 | ||
23 | "breadCrumbButton": { | 23 | "breadCrumbButton": { |
24 | "prototype": "montage/ui/button.reel", | 24 | "prototype": "montage/ui/native/button.reel", |
25 | "properties": { | 25 | "properties": { |
26 | "element": {"#": "breadcrumb_button"} | 26 | "element": {"#": "breadcrumb_button"} |
27 | }, | 27 | }, |