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/colorpanelbase.reel | |
| 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/colorpanelbase.reel')
| -rwxr-xr-x | js/panels/color/colorpanelbase.reel/colorpanelbase.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/panels/color/colorpanelbase.reel/colorpanelbase.html b/js/panels/color/colorpanelbase.reel/colorpanelbase.html index f40bd448..19bc4b6b 100755 --- a/js/panels/color/colorpanelbase.reel/colorpanelbase.html +++ b/js/panels/color/colorpanelbase.reel/colorpanelbase.html | |||
| @@ -26,7 +26,7 @@ | |||
| 26 | 26 | ||
| 27 | <body> | 27 | <body> |
| 28 | 28 | ||
| 29 | <div id="cp_expanded" class="cp_expanded"> | 29 | <div data-montage-id="cp_expanded" class="cp_expanded"> |
| 30 | <div class="cp_history"> | 30 | <div class="cp_history"> |
| 31 | <button class="cp_color_current">Current Color</button> | 31 | <button class="cp_color_current">Current Color</button> |
| 32 | <button class="cp_color_previous">Previous Color</button> | 32 | <button class="cp_color_previous">Previous Color</button> |