diff options
| author | Ananya Sen | 2012-05-31 10:13:40 -0700 |
|---|---|---|
| committer | Ananya Sen | 2012-05-31 10:13:40 -0700 |
| commit | 286457b4f23974277274ba388afd283e8aa085cb (patch) | |
| tree | c21bf791e7c4f572d12f97987ea6b89e74da67fe /js/components/tools-properties/pencil-properties.reel/pencil-properties.html | |
| parent | 4d9b481c58090e8f1fc7b0e9d73a81b0f49cccc8 (diff) | |
| parent | d49c909cff7f0c5e5d0b127ad84a2fefc6677dc6 (diff) | |
| download | ninja-286457b4f23974277274ba388afd283e8aa085cb.tar.gz | |
Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste
Conflicts:
js/controllers/styles-controller.js
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/components/tools-properties/pencil-properties.reel/pencil-properties.html')
| -rwxr-xr-x | js/components/tools-properties/pencil-properties.reel/pencil-properties.html | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/js/components/tools-properties/pencil-properties.reel/pencil-properties.html b/js/components/tools-properties/pencil-properties.reel/pencil-properties.html deleted file mode 100755 index cbe626b2..00000000 --- a/js/components/tools-properties/pencil-properties.reel/pencil-properties.html +++ /dev/null | |||
| @@ -1,31 +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="pencil-properties.css"> | ||
| 11 | |||
| 12 | <script type="text/montage-serialization"> | ||
| 13 | { | ||
| 14 | |||
| 15 | "owner": { | ||
| 16 | "prototype": "js/components/tools-properties/pencil-properties.reel", | ||
| 17 | "properties": { | ||
| 18 | "element": {"#": "pencilProperties"} | ||
| 19 | } | ||
| 20 | } | ||
| 21 | } | ||
| 22 | </script> | ||
| 23 | |||
| 24 | </head> | ||
| 25 | |||
| 26 | <body> | ||
| 27 | <div data-montage-id="pencilProperties" class="subToolHolderPanel"> | ||
| 28 | </div> | ||
| 29 | </body> | ||
| 30 | |||
| 31 | </html> \ No newline at end of file | ||