diff options
| author | Nivesh Rajbhandari | 2012-06-13 13:51:39 -0700 |
|---|---|---|
| committer | Nivesh Rajbhandari | 2012-06-13 13:51:39 -0700 |
| commit | 263ecfc95bd7eb5c726cd5688c3d74eb10296811 (patch) | |
| tree | 7c907dd58e9b4f4a1d4802d8d22b9c84d3c2edf3 /node_modules/montage-google/youtube-player.reel/youtube-player.html | |
| parent | 1bb2778224982aea7b9781c6559bb659983a400f (diff) | |
| parent | a827f2769d75848c0ba0bff03a927c1f2706322b (diff) | |
| download | ninja-263ecfc95bd7eb5c726cd5688c3d74eb10296811.tar.gz | |
Merge branch 'refs/heads/ninja-internal' into PI_HotTextFixes
Conflicts:
js/panels/properties.reel/sections/position-size.reel/position-size.html
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'node_modules/montage-google/youtube-player.reel/youtube-player.html')
| -rw-r--r-- | node_modules/montage-google/youtube-player.reel/youtube-player.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/node_modules/montage-google/youtube-player.reel/youtube-player.html b/node_modules/montage-google/youtube-player.reel/youtube-player.html index d51cecdb..41e5922b 100644 --- a/node_modules/montage-google/youtube-player.reel/youtube-player.html +++ b/node_modules/montage-google/youtube-player.reel/youtube-player.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-google/youtube-player.reel", | 14 | "prototype": "youtube-player.reel", |
| 15 | "properties": { | 15 | "properties": { |
| 16 | "element": {"#": "iframe"} | 16 | "element": {"#": "iframe"} |
| 17 | } | 17 | } |