diff options
author | Nivesh Rajbhandari | 2012-06-01 06:53:58 -0700 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-06-01 06:53:58 -0700 |
commit | 69ca67093bb53188dca5437e0bfbfb7f676ada85 (patch) | |
tree | cc2b387c796b0f34f1ab00a7c542c335d52005e9 /js/stage/stage-view.reel/stage-view.html | |
parent | b7f048624c07a1186cca080bf4c9a87af7d53f35 (diff) | |
parent | 7fcb10270f9e19415f8452c261c2d0c86916a29a (diff) | |
download | ninja-69ca67093bb53188dca5437e0bfbfb7f676ada85.tar.gz |
Merge branch 'refs/heads/valerio-document-bindings-fix' into document-bindings-fix
Conflicts:
js/stage/stage.reel/stage.js
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js/stage/stage-view.reel/stage-view.html')
-rwxr-xr-x | js/stage/stage-view.reel/stage-view.html | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/js/stage/stage-view.reel/stage-view.html b/js/stage/stage-view.reel/stage-view.html deleted file mode 100755 index 3680e8b5..00000000 --- a/js/stage/stage-view.reel/stage-view.html +++ /dev/null | |||
@@ -1,30 +0,0 @@ | |||
1 | <!DOCTYPE html> | ||
2 | <!-- <copyright> | ||
3 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | ||
4 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | ||
5 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | ||
6 | </copyright> --> | ||
7 | <html> | ||
8 | <head> | ||
9 | <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> | ||
10 | <link rel="stylesheet" type="text/css" href="stage-view.css"> | ||
11 | |||
12 | <script type="text/montage-serialization"> | ||
13 | { | ||
14 | "owner": { | ||
15 | "prototype": "js/stage/stage-view.reel", | ||
16 | "properties": { | ||
17 | "element": {"#": "codeViewContainer"} | ||
18 | } | ||
19 | } | ||
20 | } | ||
21 | </script> | ||
22 | |||
23 | </head> | ||
24 | <body> | ||
25 | |||
26 | |||
27 | <section id="codeViewContainer" class="codeViewContainer"></section> | ||
28 | |||
29 | </body> | ||
30 | </html> | ||