diff options
| author | Pushkar Joshi | 2012-02-24 12:08:49 -0800 |
|---|---|---|
| committer | Pushkar Joshi | 2012-02-24 12:08:49 -0800 |
| commit | 03ca7a5ed13c25faaa9100bb666e062fd15335e6 (patch) | |
| tree | c51112223ceb9121cd595a60335eb2795215590f /js/components/treeview/ninja-leaf.reel/ninja-leaf.html | |
| parent | fcb12cc09eb3cd3b42bd215877ba18f449275b75 (diff) | |
| parent | 053fc63a2950c7a5ee4ebf98033b64d474a3c46e (diff) | |
| download | ninja-03ca7a5ed13c25faaa9100bb666e062fd15335e6.tar.gz | |
Merge branch 'pentool' into brushtool
Conflicts:
imports/codemirror/mode/scheme/scheme.js
js/tools/BrushTool.js
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 |