diff options
author | hwc487 | 2012-06-13 14:04:09 -0700 |
---|---|---|
committer | hwc487 | 2012-06-13 14:04:09 -0700 |
commit | 3e481dd581e0305dd8b572ed0d17e86622223464 (patch) | |
tree | aca2b28aa72857a52e047fb94090c34ab8dd1c2c /node_modules/montage/ui/popup/popup.reel/popup.html | |
parent | a7aa51e6b91623772eef54b827616432838b560e (diff) | |
parent | 682f4917d6badd105998c3dd84d031c38b51f017 (diff) | |
download | ninja-3e481dd581e0305dd8b572ed0d17e86622223464.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Diffstat (limited to 'node_modules/montage/ui/popup/popup.reel/popup.html')
-rwxr-xr-x | node_modules/montage/ui/popup/popup.reel/popup.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/node_modules/montage/ui/popup/popup.reel/popup.html b/node_modules/montage/ui/popup/popup.reel/popup.html index 5bc74dae..140d7850 100755 --- a/node_modules/montage/ui/popup/popup.reel/popup.html +++ b/node_modules/montage/ui/popup/popup.reel/popup.html | |||
@@ -11,7 +11,7 @@ | |||
11 | <script type="text/montage-serialization"> | 11 | <script type="text/montage-serialization"> |
12 | { | 12 | { |
13 | "slot1": { | 13 | "slot1": { |
14 | "prototype": "montage/ui/slot.reel", | 14 | "prototype": "ui/slot.reel", |
15 | "properties": { | 15 | "properties": { |
16 | "element": { | 16 | "element": { |
17 | "#": "popup-content" | 17 | "#": "popup-content" |
@@ -19,7 +19,7 @@ | |||
19 | } | 19 | } |
20 | }, | 20 | }, |
21 | "owner": { | 21 | "owner": { |
22 | "prototype": "montage/ui/popup/popup.reel", | 22 | "prototype": "ui/popup/popup.reel", |
23 | "properties": { | 23 | "properties": { |
24 | "element": { | 24 | "element": { |
25 | "#": "popup-container" | 25 | "#": "popup-container" |