diff options
| author | Jonathan Duran | 2012-06-05 08:42:53 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-06-05 08:42:53 -0700 |
| commit | bd2c28100f347afc10243c80b8a288746370eee2 (patch) | |
| tree | db507fe0fdbe8e6f98f7d0f022b29c8d5942b4f7 /js/components/toolbar.reel/toolbar.html | |
| parent | 121d0e616f48aa7cd048763554089c20a1883d7a (diff) | |
| parent | c1ec69879028220b0c3f11ad6e24035bf527802c (diff) | |
| download | ninja-bd2c28100f347afc10243c80b8a288746370eee2.tar.gz | |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Conflicts:
js/controllers/elements/element-controller.js
js/panels/Timeline/Layer.reel/Layer.js
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
Signed-off-by: Jonathan Duran <jduran@motorola.com>
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": " " |