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/components/colorwheel.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/components/colorwheel.reel')
| -rwxr-xr-x | js/components/colorwheel.reel/colorwheel.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/components/colorwheel.reel/colorwheel.html b/js/components/colorwheel.reel/colorwheel.html index ef955c2d..707bd637 100755 --- a/js/components/colorwheel.reel/colorwheel.html +++ b/js/components/colorwheel.reel/colorwheel.html | |||
| @@ -29,7 +29,7 @@ | |||
| 29 | 29 | ||
| 30 | <body> | 30 | <body> |
| 31 | 31 | ||
| 32 | <div id="colorwheel" class="colorwheel"> | 32 | <div data-montage-id="colorwheel" class="colorwheel"> |
| 33 | <canvas></canvas> | 33 | <canvas></canvas> |
| 34 | <canvas></canvas> | 34 | <canvas></canvas> |
| 35 | <canvas></canvas> | 35 | <canvas></canvas> |