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/content.reel/content.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/content.reel/content.html')
| -rw-r--r-- | js/panels/presets/content.reel/content.html | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/js/panels/presets/content.reel/content.html b/js/panels/presets/content.reel/content.html index 27928670..50a48389 100644 --- a/js/panels/presets/content.reel/content.html +++ b/js/panels/presets/content.reel/content.html | |||
| @@ -55,13 +55,13 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
| 55 | </script> | 55 | </script> |
| 56 | </head> | 56 | </head> |
| 57 | <body> | 57 | <body> |
| 58 | <section id="presetsPanel" class="presetsPanel"> | 58 | <section data-montage-id="presetsPanel" class="presetsPanel"> |
| 59 | <nav id="tab-bar" class="tab-bar"> | 59 | <nav data-montage-id="tab-bar" class="tab-bar"> |
| 60 | <div id="styles">Styles</div> | 60 | <div data-montage-id="styles">Styles</div> |
| 61 | <div id="transitions">Transitions</div> | 61 | <div data-montage-id="transitions">Transitions</div> |
| 62 | <div id="animations">Animations</div> | 62 | <div data-montage-id="animations">Animations</div> |
| 63 | </nav> | 63 | </nav> |
| 64 | <div id="librarySlot" class="librarySlot"></div> | 64 | <div data-montage-id="librarySlot" class="librarySlot"></div> |
| 65 | </section> | 65 | </section> |
| 66 | </body> | 66 | </body> |
| 67 | </html> \ No newline at end of file | 67 | </html> \ No newline at end of file |