Merge branch 'master' into components

Conflicts: node_modules/montage/ui/bluemoon/progress.reel/progress.html node_modules/montage/ui/image2.reel/image2.html node_modules/ninja-components/effect/desaturate-effect.js node_modules/ninja-components/effect/effect.js node_modules/ninja-components/effect/invert-effect.js node_modules/ninja-components/effect/kaliedoscope-effect.js node_modules/ninja-components/effect/multiply-effect.js node_modules/ninja-components/effect/sepia-effect.js node_modules/ninja-components/flow-controller.reel/flow-controller.html node_modules/ninja-components/flow-controller.reel/flow-controller.js node_modules/ninja-components/flow-offset.js node_modules/ninja-components/hottext.reel/hottext.css node_modules/ninja-components/hottext.reel/hottext.html node_modules/ninja-components/hottext.reel/hottext.js node_modules/ninja-components/hottextunit.reel/hottextunit.css node_modules/ninja-components/hottextunit.reel/hottextunit.html node_modules/ninja-components/hottextunit.reel/hottextunit.js node_modules/ninja-components/image2.reel/image2.html node_modules/ninja-components/image2.reel/image2.js node_modules/ninja-components/image3d.reel/image3d.html node_modules/ninja-components/image3d.reel/image3d.js node_modules/ninja-components/photo-editor.reel/photo-editor.css node_modules/ninja-components/photo-editor.reel/photo-editor.html node_modules/ninja-components/photo-editor.reel/photo-editor.js node_modules/ninja-components/slider-base.js user-document-templates/montage-application-cloud/appdelegate.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
author: Valerio Virgillito 2012-02-03 12:20:10 -0800
committer: Valerio Virgillito 2012-02-03 12:20:10 -0800
commit: e6e539f345f5e1ac36a595db5d1a1c3700715e88 (patch)
tree: 39846bf1570f9b5a4057b726c54905de9e9e1c02 /node_modules/montage/ui/loading-panel.reel/loading-panel.html
parent: 7950424cf704bb221971f4645406b01e6979db18 (diff)
parent: c630ead20487c3948fa36448d3e7d5f7b5cba782 (diff)
download: ninja-e6e539f345f5e1ac36a595db5d1a1c3700715e88.tar.gz
1 files changed, 1 insertions, 1 deletions
diff --git a/node_modules/montage/ui/loading-panel.reel/loading-panel.html b/node_modules/montage/ui/loading-panel.reel/loading-panel.html
index ccd6d9bd..27825a09 100755
--- a/node_modules/montage/ui/loading-panel.reel/loading-panel.html
+++ b/node_modules/montage/ui/loading-panel.reel/loading-panel.html
@@ -22,7 +22,7 @@
            },
            "loadingIndicator": {
-                "module": "montage/ui/progress.reel",
+                "module": "montage/ui/bluemoon/progress.reel",
                "name": "Progress",
                "properties": {
                    "element": {"#": "loadingIndicator"},
author	Valerio Virgillito	2012-02-03 12:20:10 -0800
committer	Valerio Virgillito	2012-02-03 12:20:10 -0800
commit	e6e539f345f5e1ac36a595db5d1a1c3700715e88 (patch)
tree	39846bf1570f9b5a4057b726c54905de9e9e1c02 /node_modules/montage/ui/loading-panel.reel/loading-panel.html
parent	7950424cf704bb221971f4645406b01e6979db18 (diff)
parent	c630ead20487c3948fa36448d3e7d5f7b5cba782 (diff)
download	ninja-e6e539f345f5e1ac36a595db5d1a1c3700715e88.tar.gz

diff --git a/node_modules/montage/ui/loading-panel.reel/loading-panel.html b/node_modules/montage/ui/loading-panel.reel/loading-panel.html index ccd6d9bd..27825a09 100755 --- a/node_modules/montage/ui/loading-panel.reel/loading-panel.html +++ b/node_modules/montage/ui/loading-panel.reel/loading-panel.html
@@ -22,7 +22,7 @@
22	},	22	},
23		23
24	"loadingIndicator": {	24	"loadingIndicator": {
25	"module": "montage/ui/progress.reel",	25	"module": "montage/ui/bluemoon/progress.reel",
26	"name": "Progress",	26	"name": "Progress",
27	"properties": {	27	"properties": {
28	"element": {"#": "loadingIndicator"},	28	"element": {"#": "loadingIndicator"},