diff options
| author | Ananya Sen | 2012-02-03 09:57:41 -0800 |
|---|---|---|
| committer | Ananya Sen | 2012-02-03 09:57:41 -0800 |
| commit | c093dd13a84ce6eb3e00a672c38a808093c5d966 (patch) | |
| tree | 5dfd4a800bbbe02a8cbcb3ffeee542686bc258bb /node_modules/montage/ui/hottextunit.reel/hottextunit.html | |
| parent | 79b0173eeca079dec42ff1480182656dbe3af44f (diff) | |
| parent | 8e06b63e5eab5558823f4923e20a832c8b36cbe2 (diff) | |
| download | ninja-c093dd13a84ce6eb3e00a672c38a808093c5d966.tar.gz | |
Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIO
Conflicts:
js/io/document/document-controller.js
js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js
js/io/ui/save-as-dialog.reel/save-as-dialog.js
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'node_modules/montage/ui/hottextunit.reel/hottextunit.html')
| -rwxr-xr-x | node_modules/montage/ui/hottextunit.reel/hottextunit.html | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/node_modules/montage/ui/hottextunit.reel/hottextunit.html b/node_modules/montage/ui/hottextunit.reel/hottextunit.html deleted file mode 100755 index 6a5e913f..00000000 --- a/node_modules/montage/ui/hottextunit.reel/hottextunit.html +++ /dev/null | |||
| @@ -1,28 +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="hottextunit.css"> | ||
| 11 | |||
| 12 | <script type="text/montage-serialization"> | ||
| 13 | { | ||
| 14 | "owner": { | ||
| 15 | "module": "montage/ui/hottextunit.reel", | ||
| 16 | "name": "HotTextUnit", | ||
| 17 | "properties": { | ||
| 18 | "element": {"#": "hottextunit"} | ||
| 19 | } | ||
| 20 | } | ||
| 21 | } | ||
| 22 | </script> | ||
| 23 | |||
| 24 | </head> | ||
| 25 | <body> | ||
| 26 | <div id="hottextunit" class="hottextunit"></div> | ||
| 27 | </body> | ||
| 28 | </html> \ No newline at end of file | ||