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/Materials/materials-library-panel.reel/materials-library-panel.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/Materials/materials-library-panel.reel/materials-library-panel.html')
| -rwxr-xr-x | js/panels/Materials/materials-library-panel.reel/materials-library-panel.html | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html index 741ff6aa..7fc48a55 100755 --- a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html +++ b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html | |||
| @@ -88,15 +88,15 @@ | |||
| 88 | </head> | 88 | </head> |
| 89 | <body> | 89 | <body> |
| 90 | 90 | ||
| 91 | <div id="materials_library_panel" class="materials_library_panel"> | 91 | <div data-montage-id="materials_library_panel" class="materials_library_panel"> |
| 92 | <section id="ml_tree_holder" class="animationsLibrary"> | 92 | <section data-montage-id="ml_tree_holder" class="animationsLibrary"> |
| 93 | <div id="materials_library_tree"></div> | 93 | <div data-montage-id="materials_library_tree"></div> |
| 94 | </section> | 94 | </section> |
| 95 | <hr /> | 95 | <hr /> |
| 96 | <div id="ml_buttons"> | 96 | <div data-montage-id="ml_buttons" class="ml_buttons"> |
| 97 | <button id="ml_add_btn" class="nj-skinned">Add</button> | 97 | <button data-montage-id="ml_add_btn" class="nj-skinned">Add</button> |
| 98 | <button id="ml_copy_btn" class="nj-skinned">Copy</button> | 98 | <button data-montage-id="ml_copy_btn" class="nj-skinned">Copy</button> |
| 99 | <button id="ml_delete_btn" class="nj-skinned">Delete</button> | 99 | <button data-montage-id="ml_delete_btn" class="nj-skinned">Delete</button> |
| 100 | </div> | 100 | </div> |
| 101 | </div> | 101 | </div> |
| 102 | 102 | ||