diff options
| author | Kruti Shah | 2012-06-12 13:09:11 -0700 |
|---|---|---|
| committer | Kruti Shah | 2012-06-12 13:09:11 -0700 |
| commit | d648c842905c7c53e0f89b943982493d2b79f56e (patch) | |
| tree | eb5585f92061975215f6d19305a8d1b76262e2fc /js/stage/stage-view.reel/stage-view.html | |
| parent | bedb38e14887b29eae3cdf1c8d435259c920257c (diff) | |
| parent | cf3b96822665751dae7a64644db3cb3960733c3d (diff) | |
| download | ninja-d648c842905c7c53e0f89b943982493d2b79f56e.tar.gz | |
Merge branch 'refs/heads/TimelineUberjd' into TimelineUber
Conflicts:
js/controllers/elements/element-controller.js
js/document/_toDelete/html-document.js
js/panels/Timeline/Layer.reel/Layer.js
Signed-off-by: Kruti Shah <kruti.shah@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> | ||