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/colorchippopup.reel/colorchippopup.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/colorchippopup.reel/colorchippopup.html')
-rwxr-xr-x | js/panels/color/colorchippopup.reel/colorchippopup.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/panels/color/colorchippopup.reel/colorchippopup.html b/js/panels/color/colorchippopup.reel/colorchippopup.html index ff0c6498..cdb26894 100755 --- a/js/panels/color/colorchippopup.reel/colorchippopup.html +++ b/js/panels/color/colorchippopup.reel/colorchippopup.html | |||
@@ -28,7 +28,7 @@ | |||
28 | 28 | ||
29 | <body> | 29 | <body> |
30 | 30 | ||
31 | <div id="cc_popup" class="cc_popup"> | 31 | <div data-montage-id="cc_popup" class="cc_popup"> |
32 | <div id="cc_pu_options"> | 32 | <div id="cc_pu_options"> |
33 | 33 | ||
34 | <div id="cc_pu_hex">#<input id="cc_pu_hottext_hex" class="cc_pu_hottext_hex" maxlength="6" /></div> | 34 | <div id="cc_pu_hex">#<input id="cc_pu_hottext_hex" class="cc_pu_hottext_hex" maxlength="6" /></div> |