diff options
| author | Jose Antonio Marquez | 2012-02-02 18:04:37 -0800 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-02-02 18:04:37 -0800 |
| commit | 7959d2ecc6e8b1799307de1ceab1112b8ab58e8d (patch) | |
| tree | ce4e32578e1af4d49b8375933a6b7edd0a095b0f /node_modules/montage/ui/loading-panel.reel/loading-panel.html | |
| parent | 83ac41dd75ec551cdb03252e0bf3081182517d05 (diff) | |
| parent | c630ead20487c3948fa36448d3e7d5f7b5cba782 (diff) | |
| download | ninja-7959d2ecc6e8b1799307de1ceab1112b8ab58e8d.tar.gz | |
Merge branch 'refs/heads/NinjaInternal' into Color
Conflicts:
js/controllers/elements/shapes-controller.js
js/data/pi/pi-data.js
js/panels/properties/content.reel/content.js
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"}, |