diff options
| author | Ananya Sen | 2012-06-26 16:07:00 -0700 |
|---|---|---|
| committer | Ananya Sen | 2012-06-26 16:07:00 -0700 |
| commit | 1d5372534d11c9c1b818ba5e7d67498c731e9ac6 (patch) | |
| tree | bc09c9f08ac2faa955995a91a78337276a81eb77 /js/components/toolbar.reel/toolbar.html | |
| parent | 3391a8e6fd5df0d464edaffd98c2b3fde23acf5a (diff) | |
| parent | 46174eb0ce93d660c8d2e9276fbdc4f9a03f056a (diff) | |
| download | ninja-1d5372534d11c9c1b818ba5e7d67498c731e9ac6.tar.gz | |
Merge branch 'refs/heads/ninja-internal-master' into bugfix-master
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 | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/js/components/toolbar.reel/toolbar.html b/js/components/toolbar.reel/toolbar.html index 51e7ebec..c23e082f 100644 --- a/js/components/toolbar.reel/toolbar.html +++ b/js/components/toolbar.reel/toolbar.html | |||
| @@ -19,8 +19,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
| 19 | }, | 19 | }, |
| 20 | 20 | ||
| 21 | "buttonList": { | 21 | "buttonList": { |
| 22 | "module": "montage/ui/repetition.reel", | 22 | "prototype" : "montage/ui/repetition.reel", |
| 23 | "name": "Repetition", | ||
| 24 | "properties": { | 23 | "properties": { |
| 25 | "element": {"#": "repetition"} | 24 | "element": {"#": "repetition"} |
| 26 | }, | 25 | }, |