diff options
| author | Nivesh Rajbhandari | 2012-06-13 13:51:39 -0700 |
|---|---|---|
| committer | Nivesh Rajbhandari | 2012-06-13 13:51:39 -0700 |
| commit | 263ecfc95bd7eb5c726cd5688c3d74eb10296811 (patch) | |
| tree | 7c907dd58e9b4f4a1d4802d8d22b9c84d3c2edf3 /js/components/layout/bread-crumb.reel/bread-crumb.html | |
| parent | 1bb2778224982aea7b9781c6559bb659983a400f (diff) | |
| parent | a827f2769d75848c0ba0bff03a927c1f2706322b (diff) | |
| download | ninja-263ecfc95bd7eb5c726cd5688c3d74eb10296811.tar.gz | |
Merge branch 'refs/heads/ninja-internal' into PI_HotTextFixes
Conflicts:
js/panels/properties.reel/sections/position-size.reel/position-size.html
Signed-off-by: Nivesh Rajbhandari <mqg734@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 0dabc781..68f3be2b 100755 --- a/js/components/layout/bread-crumb.reel/bread-crumb.html +++ b/js/components/layout/bread-crumb.reel/bread-crumb.html | |||
| @@ -40,7 +40,7 @@ | |||
| 40 | "buttonsListController": { | 40 | "buttonsListController": { |
| 41 | "prototype": "montage/ui/controller/array-controller", | 41 | "prototype": "montage/ui/controller/array-controller", |
| 42 | "bindings": { | 42 | "bindings": { |
| 43 | "content": {"<<->": "@owner.containerElements"} | 43 | "content": {"<->": "@owner.containerElements"} |
| 44 | } | 44 | } |
| 45 | }, | 45 | }, |
| 46 | 46 | ||