aboutsummaryrefslogtreecommitdiff
path: root/js/components/colorbar.reel
diff options
context:
space:
mode:
authorhwc4872012-05-11 13:52:55 -0700
committerhwc4872012-05-11 13:52:55 -0700
commit137bfc9d4c41cc918d969565bec28a834fe10472 (patch)
treee9fa109fc65218f45e386df48b713ff5858f3d62 /js/components/colorbar.reel
parentd21aaca3d7093b6af968b7f9f764ab54e004f02b (diff)
parent27f4cacb39de1c2e3910748dadc9fc16d0655480 (diff)
downloadninja-137bfc9d4c41cc918d969565bec28a834fe10472.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Conflicts: js/lib/geom/geom-obj.js js/lib/geom/rectangle.js js/tools/TagTool.js
Diffstat (limited to 'js/components/colorbar.reel')
-rwxr-xr-xjs/components/colorbar.reel/colorbar.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/components/colorbar.reel/colorbar.html b/js/components/colorbar.reel/colorbar.html
index c5bc186a..2e189c87 100755
--- a/js/components/colorbar.reel/colorbar.html
+++ b/js/components/colorbar.reel/colorbar.html
@@ -29,7 +29,7 @@
29 29
30 <body> 30 <body>
31 31
32 <canvas id="colorbar" class="colorbar"></canvas> 32 <canvas data-montage-id="colorbar" class="colorbar"></canvas>
33 33
34 </body> 34 </body>
35 35