diff options
| author | Jose Antonio Marquez | 2012-02-02 18:04:37 -0800 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-02-02 18:04:37 -0800 |
| commit | 7959d2ecc6e8b1799307de1ceab1112b8ab58e8d (patch) | |
| tree | ce4e32578e1af4d49b8375933a6b7edd0a095b0f /node_modules/montage/ui/bluemoon/textarea.reel/textarea.html | |
| parent | 83ac41dd75ec551cdb03252e0bf3081182517d05 (diff) | |
| parent | c630ead20487c3948fa36448d3e7d5f7b5cba782 (diff) | |
| download | ninja-7959d2ecc6e8b1799307de1ceab1112b8ab58e8d.tar.gz | |
Merge branch 'refs/heads/NinjaInternal' into Color
Conflicts:
js/controllers/elements/shapes-controller.js
js/data/pi/pi-data.js
js/panels/properties/content.reel/content.js
Diffstat (limited to 'node_modules/montage/ui/bluemoon/textarea.reel/textarea.html')
| -rw-r--r-- | node_modules/montage/ui/bluemoon/textarea.reel/textarea.html | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/node_modules/montage/ui/bluemoon/textarea.reel/textarea.html b/node_modules/montage/ui/bluemoon/textarea.reel/textarea.html new file mode 100644 index 00000000..850fe533 --- /dev/null +++ b/node_modules/montage/ui/bluemoon/textarea.reel/textarea.html | |||
| @@ -0,0 +1,15 @@ | |||
| 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="textarea.css"> | ||
| 11 | </head> | ||
| 12 | <body> | ||
| 13 | |||
| 14 | </body> | ||
| 15 | </html> | ||