diff options
| author | hwc487 | 2012-07-09 16:08:02 -0700 |
|---|---|---|
| committer | hwc487 | 2012-07-09 16:08:02 -0700 |
| commit | 5085d0f67df89a21715308956004164597a6ba79 (patch) | |
| tree | 2c896163143a66331205a39b0a3b1b45d51bf12a /js/components/toolbar.reel/toolbar.html | |
| parent | 51f1691f792dbda9b740ded8aa0457c9406db156 (diff) | |
| parent | 84b3327bd92faafab7954b5eb64c7abe24a3fe13 (diff) | |
| download | ninja-5085d0f67df89a21715308956004164597a6ba79.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into GridFixes
Conflicts:
js/helper-classes/3D/StageLine.js
Diffstat (limited to 'js/components/toolbar.reel/toolbar.html')
| -rw-r--r-- | js/components/toolbar.reel/toolbar.html | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/js/components/toolbar.reel/toolbar.html b/js/components/toolbar.reel/toolbar.html index 6ab87048..42b0a727 100644 --- a/js/components/toolbar.reel/toolbar.html +++ b/js/components/toolbar.reel/toolbar.html | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | <!DOCTYPE html> | 1 | <!doctype html> |
| 2 | <!-- <copyright> | 2 | <!-- <copyright> |
| 3 | Copyright (c) 2012, Motorola Mobility, Inc | 3 | Copyright (c) 2012, Motorola Mobility, Inc |
| 4 | All Rights Reserved. | 4 | All Rights Reserved. |
| @@ -41,7 +41,7 @@ POSSIBILITY OF SUCH DAMAGE. | |||
| 41 | "repetition": {"@": "buttonList" } | 41 | "repetition": {"@": "buttonList" } |
| 42 | } | 42 | } |
| 43 | }, | 43 | }, |
| 44 | 44 | ||
| 45 | "buttonList": { | 45 | "buttonList": { |
| 46 | "prototype" : "montage/ui/repetition.reel", | 46 | "prototype" : "montage/ui/repetition.reel", |
| 47 | "properties": { | 47 | "properties": { |
| @@ -51,7 +51,7 @@ POSSIBILITY OF SUCH DAMAGE. | |||
| 51 | "objects": {"<-": "@owner.buttons"} | 51 | "objects": {"<-": "@owner.buttons"} |
| 52 | } | 52 | } |
| 53 | }, | 53 | }, |
| 54 | 54 | ||
| 55 | "button": { | 55 | "button": { |
| 56 | "prototype": "js/components/toolbar.reel/toolbar-button", | 56 | "prototype": "js/components/toolbar.reel/toolbar-button", |
| 57 | "properties": { | 57 | "properties": { |