diff options
| author | Valerio Virgillito | 2012-02-13 21:43:51 -0800 |
|---|---|---|
| committer | Valerio Virgillito | 2012-02-13 21:43:51 -0800 |
| commit | 081f17954c735fc8b946d72a25b0ee60d370ef9b (patch) | |
| tree | de7b50f2d02365df897ef4356f953d3833c9cabd /js/components/treeview/ninja-leaf.reel/ninja-leaf.html | |
| parent | 47df0aff81c25334b129047bb227ea5015357eda (diff) | |
| parent | 1d82f1a041612f32bbf6c9f20d9fb14e2d11fcc7 (diff) | |
| download | ninja-081f17954c735fc8b946d72a25b0ee60d370ef9b.tar.gz | |
Merge branch 'refs/heads/master' into components
Conflicts:
js/components/treeview/ninja-leaf.reel/ninja-leaf.js
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/components/treeview/ninja-leaf.reel/ninja-leaf.html')
| -rw-r--r-- | js/components/treeview/ninja-leaf.reel/ninja-leaf.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/components/treeview/ninja-leaf.reel/ninja-leaf.html b/js/components/treeview/ninja-leaf.reel/ninja-leaf.html index bd8e8acd..310274bc 100644 --- a/js/components/treeview/ninja-leaf.reel/ninja-leaf.html +++ b/js/components/treeview/ninja-leaf.reel/ninja-leaf.html | |||
| @@ -37,7 +37,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
| 37 | </head> | 37 | </head> |
| 38 | <body> | 38 | <body> |
| 39 | <div id="leaf" class="leaf"> | 39 | <div id="leaf" class="leaf"> |
| 40 | <div id="label" class="leaf-label"></div> | 40 | <div id="label" class="leaf-label" draggable="true"></div> |
| 41 | </div> | 41 | </div> |
| 42 | </body> | 42 | </body> |
| 43 | </html> \ No newline at end of file | 43 | </html> \ No newline at end of file |