aboutsummaryrefslogtreecommitdiff
path: root/js/components/colorbar.reel/colorbar.html
diff options
context:
space:
mode:
authorValerio Virgillito2012-06-18 22:22:57 -0700
committerValerio Virgillito2012-06-18 22:22:57 -0700
commit795a6908ccac21b773490954371f2c4def9e5379 (patch)
tree68db12b1fc96286cc8ff78034c7b155df71f9ef3 /js/components/colorbar.reel/colorbar.html
parentad6f78493295c9c7b4c11cd6a895dd5cc8e207f7 (diff)
parent918a4f5870e972b6e4e301c3237e065a1ffd26f5 (diff)
downloadninja-795a6908ccac21b773490954371f2c4def9e5379.tar.gz
Merge branch 'refs/heads/master' into montage-v11-integration
Diffstat (limited to 'js/components/colorbar.reel/colorbar.html')
-rwxr-xr-xjs/components/colorbar.reel/colorbar.html4
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">