diff options
| author | Pushkar Joshi | 2012-06-13 14:00:31 -0700 |
|---|---|---|
| committer | Pushkar Joshi | 2012-06-13 14:00:31 -0700 |
| commit | 596765056ca6e5b08395c6d7ea19e7684c2acaf3 (patch) | |
| tree | 480f42ffc0782ca768284c1208a8f99adb5636a2 /node_modules/montage/ui/loading.reel/loading.html | |
| parent | 75df16b937bb420e7d93a411e73f7b59578b1b7e (diff) | |
| parent | 682f4917d6badd105998c3dd84d031c38b51f017 (diff) | |
| download | ninja-596765056ca6e5b08395c6d7ea19e7684c2acaf3.tar.gz | |
Merge branch 'master' into brushtool
Diffstat (limited to 'node_modules/montage/ui/loading.reel/loading.html')
| -rwxr-xr-x | node_modules/montage/ui/loading.reel/loading.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/node_modules/montage/ui/loading.reel/loading.html b/node_modules/montage/ui/loading.reel/loading.html index 3d19b4cc..00d3cab4 100755 --- a/node_modules/montage/ui/loading.reel/loading.html +++ b/node_modules/montage/ui/loading.reel/loading.html | |||
| @@ -11,7 +11,7 @@ | |||
| 11 | <script type="text/montage-serialization"> | 11 | <script type="text/montage-serialization"> |
| 12 | { | 12 | { |
| 13 | "owner": { | 13 | "owner": { |
| 14 | "prototype": "montage/ui/loading.reel", | 14 | "prototype": "ui/loading.reel", |
| 15 | "properties": { | 15 | "properties": { |
| 16 | "element": { | 16 | "element": { |
| 17 | "#": "loading" | 17 | "#": "loading" |