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/tools-properties/oval-properties.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/tools-properties/oval-properties.reel')
| -rwxr-xr-x | js/components/tools-properties/oval-properties.reel/oval-properties.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/components/tools-properties/oval-properties.reel/oval-properties.html b/js/components/tools-properties/oval-properties.reel/oval-properties.html index e460f7ea..c76e8c39 100755 --- a/js/components/tools-properties/oval-properties.reel/oval-properties.html +++ b/js/components/tools-properties/oval-properties.reel/oval-properties.html | |||
| @@ -35,9 +35,9 @@ | |||
| 35 | </head> | 35 | </head> |
| 36 | 36 | ||
| 37 | <body> | 37 | <body> |
| 38 | <div id="ovalProperties"> | 38 | <div data-montage-id="ovalProperties"> |
| 39 | <label class="label">Inner Radius:</label> | 39 | <label class="label">Inner Radius:</label> |
| 40 | <div id="innerRadiusControl" class="label"></div> | 40 | <div data-montage-id="innerRadiusControl" class="label"></div> |
| 41 | </div> | 41 | </div> |
| 42 | </body> | 42 | </body> |
| 43 | 43 | ||