diff options
author | hwc487 | 2012-05-11 13:52:55 -0700 |
---|---|---|
committer | hwc487 | 2012-05-11 13:52:55 -0700 |
commit | 137bfc9d4c41cc918d969565bec28a834fe10472 (patch) | |
tree | e9fa109fc65218f45e386df48b713ff5858f3d62 /js/panels/color/colortoolbar.reel/colortoolbar.html | |
parent | d21aaca3d7093b6af968b7f9f764ab54e004f02b (diff) | |
parent | 27f4cacb39de1c2e3910748dadc9fc16d0655480 (diff) | |
download | ninja-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/panels/color/colortoolbar.reel/colortoolbar.html')
-rwxr-xr-x | js/panels/color/colortoolbar.reel/colortoolbar.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/panels/color/colortoolbar.reel/colortoolbar.html b/js/panels/color/colortoolbar.reel/colortoolbar.html index e32a475c..6561ed99 100755 --- a/js/panels/color/colortoolbar.reel/colortoolbar.html +++ b/js/panels/color/colortoolbar.reel/colortoolbar.html | |||
@@ -28,7 +28,7 @@ | |||
28 | 28 | ||
29 | <body> | 29 | <body> |
30 | 30 | ||
31 | <div id="colortoolbar" class="colortoolbar"> | 31 | <div data-montage-id="colortoolbar" class="colortoolbar"> |
32 | 32 | ||
33 | <div class="cpe_stroke_icon selected"></div> | 33 | <div class="cpe_stroke_icon selected"></div> |
34 | 34 | ||