diff options
| author | Armen Kesablyan | 2012-06-19 01:03:59 -0700 |
|---|---|---|
| committer | Armen Kesablyan | 2012-06-19 01:03:59 -0700 |
| commit | 2e13a73e4ee980a6f73f6ff48b2a195eb209a7db (patch) | |
| tree | d352f5e769eae0e1b7b76ccbeafa9b174b1a9918 /js/components/colorbar.reel/colorbar.html | |
| parent | 244e608645778746d1a3b5aa0d4c0868f7c5c272 (diff) | |
| parent | c59eb371559a3061ce53223e249ca97daace5968 (diff) | |
| download | ninja-2e13a73e4ee980a6f73f6ff48b2a195eb209a7db.tar.gz | |
Merge branch 'refs/heads/master' into binding
Conflicts:
js/components/layout/tools-list.reel/tools-list.html
js/components/layout/tools-properties.reel/tools-properties.html
js/document/document-html.js
js/document/templates/app/main.js
js/panels/Panel.reel/Panel.js
node_modules/montage/ui/native-control.js
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/components/colorbar.reel/colorbar.html')
| -rwxr-xr-x | js/components/colorbar.reel/colorbar.html | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/js/components/colorbar.reel/colorbar.html b/js/components/colorbar.reel/colorbar.html index 2e189c87..5018b1f4 100755 --- a/js/components/colorbar.reel/colorbar.html +++ b/js/components/colorbar.reel/colorbar.html | |||
| @@ -6,11 +6,9 @@ | |||
| 6 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | 6 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. |
| 7 | </copyright> | 7 | </copyright> |
| 8 | --> | 8 | --> |
| 9 | <html lang="en"> | 9 | <html> |
| 10 | <head> | 10 | <head> |
| 11 | 11 | ||
| 12 | <meta http-equiv="content-type" content="text/html; charset=utf-8" /> | ||
| 13 | |||
| 14 | <link rel="stylesheet" type="text/css" href="css/colorbar.css"> | 12 | <link rel="stylesheet" type="text/css" href="css/colorbar.css"> |
| 15 | 13 | ||
| 16 | <script type="text/montage-serialization"> | 14 | <script type="text/montage-serialization"> |