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.reel/custom.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.reel/custom.html')
| -rwxr-xr-x | js/panels/properties.reel/sections/custom.reel/custom.html | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/js/panels/properties.reel/sections/custom.reel/custom.html b/js/panels/properties.reel/sections/custom.reel/custom.html index cc48d2e7..cfc5208c 100755 --- a/js/panels/properties.reel/sections/custom.reel/custom.html +++ b/js/panels/properties.reel/sections/custom.reel/custom.html | |||
| @@ -49,9 +49,9 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
| 49 | </script> | 49 | </script> |
| 50 | </head> | 50 | </head> |
| 51 | <body> | 51 | <body> |
| 52 | <div id="section" class="sectional"> | 52 | <div data-montage-id="section" class="sectional"> |
| 53 | <div id="repetitionContainer"> | 53 | <div data-montage-id="repetitionContainer"> |
| 54 | <div id="repeitionContent"></div> | 54 | <div data-montage-id="repeitionContent"></div> |
| 55 | </div> | 55 | </div> |
| 56 | </div> | 56 | </div> |
| 57 | </body> | 57 | </body> |