diff options
| author | Armen Kesablyan | 2012-02-07 16:55:34 -0800 |
|---|---|---|
| committer | Armen Kesablyan | 2012-02-07 16:55:34 -0800 |
| commit | 10f0ad4c15f090b2d0d50d11e4c7aaf291e9eb0e (patch) | |
| tree | 12b31910a3c7c7fa2ee0b26d8aaa611710e139a5 /node_modules/montage/ui/loading-panel.reel/loading-panel.html | |
| parent | 7f8730c3add146f1ba107e6fc22d1f5a8348ed8b (diff) | |
| parent | 668510892537eaaeb2e11520831d87b44b2489b7 (diff) | |
| download | ninja-10f0ad4c15f090b2d0d50d11e4c7aaf291e9eb0e.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into text-tool
Conflicts:
_scss/compass_app_log.txt
css/ninja.css
Diffstat (limited to 'node_modules/montage/ui/loading-panel.reel/loading-panel.html')
| -rwxr-xr-x | node_modules/montage/ui/loading-panel.reel/loading-panel.html | 2 |
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 @@ | |||
| 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"}, |