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/presets/transitions-presets.reel/transitions-presets.html | |
| 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/presets/transitions-presets.reel/transitions-presets.html')
| -rw-r--r-- | js/panels/presets/transitions-presets.reel/transitions-presets.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/panels/presets/transitions-presets.reel/transitions-presets.html b/js/panels/presets/transitions-presets.reel/transitions-presets.html index 2f084463..a6b98aeb 100644 --- a/js/panels/presets/transitions-presets.reel/transitions-presets.html +++ b/js/panels/presets/transitions-presets.reel/transitions-presets.html | |||
| @@ -48,8 +48,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
| 48 | </script> | 48 | </script> |
| 49 | </head> | 49 | </head> |
| 50 | <body> | 50 | <body> |
| 51 | <section id="transitionsLibrary" class="transitionsLibrary"> | 51 | <section data-montage-id="transitionsLibrary" class="transitionsLibrary"> |
| 52 | <div id="libraryContainer"></div> | 52 | <div data-montage-id="libraryContainer"></div> |
| 53 | </section> | 53 | </section> |
| 54 | </body> | 54 | </body> |
| 55 | </html> \ No newline at end of file | 55 | </html> \ No newline at end of file |