diff options
| author | John Mayhew | 2012-05-07 16:30:19 -0700 |
|---|---|---|
| committer | John Mayhew | 2012-05-07 16:30:19 -0700 |
| commit | db4ba95f50148198759dde503ec1c778184d9dbe (patch) | |
| tree | 8b79ad58108af2f17d15abc8cdc33d35229ab20d /js/panels/properties.reel/sections/custom.reel/custom.html | |
| parent | 843d8ea8ee58a54bcb71d7b28dbf78fae153b491 (diff) | |
| parent | 526e423e4a2734c2b139af23911e912452a4443f (diff) | |
| download | ninja-db4ba95f50148198759dde503ec1c778184d9dbe.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into WorkingBranch
Conflicts:
js/components/layout/tools-list.reel/tools-list.html
js/components/layout/tools-properties.reel/tools-properties.html
js/components/tools-properties/brush-properties.reel/brush-properties.html
js/components/tools-properties/fill-properties.reel/fill-properties.html
js/components/tools-properties/pen-properties.reel/pen-properties.html
js/components/tools-properties/pencil-properties.reel/pencil-properties.html
js/components/tools-properties/selection-properties.reel/selection-properties.html
js/components/tools-properties/shape-properties.reel/shape-properties.html
js/components/tools-properties/tag-properties.reel/tag-properties.html
js/components/tools-properties/text-properties.reel/text-properties.html
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> |