aboutsummaryrefslogtreecommitdiff
path: root/js/components/colorbar.reel/colorbar.html
diff options
context:
space:
mode:
authorJonathan Duran2012-06-19 08:40:26 -0700
committerJonathan Duran2012-06-19 08:40:26 -0700
commit6f25a2e70079de6bcbb8c3411ddef88c2ed1ea39 (patch)
tree253e5f6dd5923218e3155f78fa67ff3e43de0ebc /js/components/colorbar.reel/colorbar.html
parentb51c9448bc187f9bfa3ab39c366657ec2bb9e2fb (diff)
parent483ad57efcd6475776f580c3af5b60e6deeaf781 (diff)
downloadninja-6f25a2e70079de6bcbb8c3411ddef88c2ed1ea39.tar.gz
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
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">