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/properties.reel/sections/custom-rows/single-row.reel/single-row.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/properties.reel/sections/custom-rows/single-row.reel/single-row.html')
| -rwxr-xr-x | js/panels/properties.reel/sections/custom-rows/single-row.reel/single-row.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/panels/properties.reel/sections/custom-rows/single-row.reel/single-row.html b/js/panels/properties.reel/sections/custom-rows/single-row.reel/single-row.html index b606e5db..88f12186 100755 --- a/js/panels/properties.reel/sections/custom-rows/single-row.reel/single-row.html +++ b/js/panels/properties.reel/sections/custom-rows/single-row.reel/single-row.html | |||
| @@ -31,11 +31,11 @@ | |||
| 31 | </script> | 31 | </script> |
| 32 | </head> | 32 | </head> |
| 33 | <body> | 33 | <body> |
| 34 | <div id="section"> | 34 | <div data-montage-id="section"> |
| 35 | <section class="fieldCol"> | 35 | <section class="fieldCol"> |
| 36 | <label><span class="lbl"></span></label> | 36 | <label><span class="lbl"></span></label> |
| 37 | <article class="fieldRow"> | 37 | <article class="fieldRow"> |
| 38 | <div id="slotElement" class="inputField"> | 38 | <div data-montage-id="slotElement" class="inputField"> |
| 39 | 39 | ||
| 40 | </div> | 40 | </div> |
| 41 | </article> | 41 | </article> |