diff options
| author | Jonathan Duran | 2012-05-11 14:13:07 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-05-11 14:13:07 -0700 |
| commit | 1e2138fc7d0007b0ad3cb4807dc1c9101190f2f2 (patch) | |
| tree | 2563aa7694c3caaf813ca71ef3250b2a76ee0041 /js/panels/color/colorpanelpopup.reel/colorpanelpopup.html | |
| parent | 32257ac142f872d3c1f6c07504bae77ae884ed93 (diff) | |
| parent | 6fcaa4e923a19672b5860b4c6f67d836680e7e99 (diff) | |
| download | ninja-1e2138fc7d0007b0ad3cb4807dc1c9101190f2f2.tar.gz | |
Merge branch 'refs/heads/TimelineUber' into TimelineProps
Diffstat (limited to 'js/panels/color/colorpanelpopup.reel/colorpanelpopup.html')
| -rwxr-xr-x | js/panels/color/colorpanelpopup.reel/colorpanelpopup.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/panels/color/colorpanelpopup.reel/colorpanelpopup.html b/js/panels/color/colorpanelpopup.reel/colorpanelpopup.html index 0698a6dc..f65d5bc0 100755 --- a/js/panels/color/colorpanelpopup.reel/colorpanelpopup.html +++ b/js/panels/color/colorpanelpopup.reel/colorpanelpopup.html | |||
| @@ -26,7 +26,7 @@ | |||
| 26 | 26 | ||
| 27 | <body> | 27 | <body> |
| 28 | 28 | ||
| 29 | <div id="cpp_popup" class="cpp_popup"> | 29 | <div data-montage-id="cpp_popup" class="cpp_popup"> |
| 30 | <div class="cp_pu_options"> | 30 | <div class="cp_pu_options"> |
| 31 | 31 | ||
| 32 | <div class="cp_pu_history"> | 32 | <div class="cp_pu_history"> |