diff options
| author | Jonathan Duran | 2012-05-09 09:58:27 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-05-09 09:58:27 -0700 |
| commit | 48a2a800155fd2d608fb7191c0180cd8f625cd44 (patch) | |
| tree | 899f9cf1b09a01bc073f92ab498236aed80b38ec /js/panels/properties.reel/sections/custom.reel | |
| parent | 2ea8a62835f4c20efff2623306e7205e6f5bf0ba (diff) | |
| parent | d220c02e246b30509b28a47fa04916ca2b8122e4 (diff) | |
| download | ninja-48a2a800155fd2d608fb7191c0180cd8f625cd44.tar.gz | |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Conflicts:
js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/panels/properties.reel/sections/custom.reel')
| -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> |