diff options
| author | Ananya Sen | 2012-06-04 10:43:29 -0700 |
|---|---|---|
| committer | Ananya Sen | 2012-06-04 10:43:29 -0700 |
| commit | 6fb29883329c9c42a8b406128b92c0e6323a47be (patch) | |
| tree | 07f46e88bccf9cdb7d4e6818e1b646b0d19f05b9 /js/components/toolbar.reel/toolbar.html | |
| parent | cf097ec69e35c07ecae5a105ed5eeb78291c9ac2 (diff) | |
| parent | c1ec69879028220b0c3f11ad6e24035bf527802c (diff) | |
| download | ninja-6fb29883329c9c42a8b406128b92c0e6323a47be.tar.gz | |
Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste
Conflicts:
js/ninja.reel/ninja.html
Signed-off-by: Ananya Sen <Ananya.Sen@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": " " |