diff options
| author | Armen Kesablyan | 2012-02-13 11:59:19 -0800 |
|---|---|---|
| committer | Armen Kesablyan | 2012-02-13 11:59:19 -0800 |
| commit | 90d0c8c0e98d062c628c061fe5765ce991fda409 (patch) | |
| tree | 9780e9dcf475bf319f3cacc1a1ad52fcf9f133af /node_modules/labs/rich-text-editor.reel/rich-text-editor.html | |
| parent | 8110e01dc5093ac6baf621103dcaa5f769e5be92 (diff) | |
| parent | e142611e22718b1f1d1696902ad9161ec5f33f98 (diff) | |
| download | ninja-90d0c8c0e98d062c628c061fe5765ce991fda409.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal
Conflicts:
css/ninja.css
js/stage/stage.reel/stage.html
js/tools/TextTool.js
node_modules/labs/rich-text-editor.reel/rich-text-editor.css
node_modules/labs/rich-text-editor.reel/rich-text-editor.html
node_modules/labs/rich-text-editor.reel/rich-text-editor.js
node_modules/labs/rich-text-editor.reel/rich-text-resizer.js
node_modules/labs/rich-text-editor.reel/rich-text-sanitizer.js
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'node_modules/labs/rich-text-editor.reel/rich-text-editor.html')
| -rw-r--r-- | node_modules/labs/rich-text-editor.reel/rich-text-editor.html | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/node_modules/labs/rich-text-editor.reel/rich-text-editor.html b/node_modules/labs/rich-text-editor.reel/rich-text-editor.html new file mode 100644 index 00000000..42425b40 --- /dev/null +++ b/node_modules/labs/rich-text-editor.reel/rich-text-editor.html | |||
| @@ -0,0 +1,27 @@ | |||
| 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 | <title></title> | ||
| 10 | <link rel="stylesheet" type="text/css" href="rich-text-editor.css"> | ||
| 11 | <script type="text/montage-serialization"> | ||
| 12 | { | ||
| 13 | "owner": { | ||
| 14 | "module": "node_modules/labs/rich-text-editor.reel", | ||
| 15 | "name": "RichTextEditor", | ||
| 16 | "properties": { | ||
| 17 | |||
| 18 | } | ||
| 19 | } | ||
| 20 | } | ||
| 21 | </script> | ||
| 22 | |||
| 23 | </head> | ||
| 24 | <body> | ||
| 25 | </body> | ||
| 26 | </html> | ||
| 27 | \ No newline at end of file | ||