diff options
| author | Valerio Virgillito | 2012-07-09 14:35:44 -0700 |
|---|---|---|
| committer | Valerio Virgillito | 2012-07-09 14:35:44 -0700 |
| commit | 84b3327bd92faafab7954b5eb64c7abe24a3fe13 (patch) | |
| tree | 3f56cbed2f08c5a81ea79eaf0bcb9bd031d8a627 /js/components/toolbar.reel/toolbar.html | |
| parent | c0a42c56f768a873ba637f5b86d5f6a84d4a3312 (diff) | |
| parent | 40c6eb2c06b34f65a74d59ef9687251952858bab (diff) | |
| download | ninja-84b3327bd92faafab7954b5eb64c7abe24a3fe13.tar.gz | |
Merge branch 'normalize' of https://github.com/kriskowal/ninja-internal
Conflicts:
js/components/gradientpicker.reel/gradientpicker.js
js/components/tools-properties/text-properties.reel/text-properties.js
js/document/views/base.js
js/document/views/design.js
js/helper-classes/3D/StageLine.js
js/helper-classes/3D/draw-utils.js
js/lib/drawing/world.js
js/lib/geom/circle.js
js/lib/geom/line.js
js/lib/geom/rectangle.js
js/lib/geom/shape-primitive.js
js/lib/rdge/materials/bump-metal-material.js
js/lib/rdge/materials/flag-material.js
js/lib/rdge/materials/fly-material.js
js/lib/rdge/materials/julia-material.js
js/lib/rdge/materials/keleidoscope-material.js
js/lib/rdge/materials/mandel-material.js
js/lib/rdge/materials/material.js
js/lib/rdge/materials/plasma-material.js
js/lib/rdge/materials/pulse-material.js
js/lib/rdge/materials/radial-gradient-material.js
js/lib/rdge/materials/taper-material.js
js/lib/rdge/materials/twist-vert-material.js
js/lib/rdge/materials/water-material.js
js/panels/Materials/materials-library-panel.reel/materials-library-panel.html
js/panels/Materials/materials-library-panel.reel/materials-library-panel.js
js/panels/Materials/materials-popup.reel/materials-popup.html
js/panels/Materials/materials-popup.reel/materials-popup.js
js/tools/LineTool.js
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
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": { |