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/components/treeview/ninja-leaf.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/components/treeview/ninja-leaf.reel')
| -rw-r--r-- | js/components/treeview/ninja-leaf.reel/ninja-leaf.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/components/treeview/ninja-leaf.reel/ninja-leaf.html b/js/components/treeview/ninja-leaf.reel/ninja-leaf.html index b759b723..6d00bb21 100644 --- a/js/components/treeview/ninja-leaf.reel/ninja-leaf.html +++ b/js/components/treeview/ninja-leaf.reel/ninja-leaf.html | |||
| @@ -34,8 +34,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
| 34 | </script> | 34 | </script> |
| 35 | </head> | 35 | </head> |
| 36 | <body> | 36 | <body> |
| 37 | <div id="leaf" class="leaf"> | 37 | <div data-montage-id="leaf" class="leaf"> |
| 38 | <div id="label" class="leaf-label" draggable="true"></div> | 38 | <div data-montage-id="label" class="leaf-label" draggable="true"></div> |
| 39 | </div> | 39 | </div> |
| 40 | </body> | 40 | </body> |
| 41 | </html> \ No newline at end of file | 41 | </html> \ No newline at end of file |