diff options
| author | hwc487 | 2012-05-11 13:52:55 -0700 |
|---|---|---|
| committer | hwc487 | 2012-05-11 13:52:55 -0700 |
| commit | 137bfc9d4c41cc918d969565bec28a834fe10472 (patch) | |
| tree | e9fa109fc65218f45e386df48b713ff5858f3d62 /js/components/ui/tree-basic/tree.reel/tree.html | |
| parent | d21aaca3d7093b6af968b7f9f764ab54e004f02b (diff) | |
| parent | 27f4cacb39de1c2e3910748dadc9fc16d0655480 (diff) | |
| download | ninja-137bfc9d4c41cc918d969565bec28a834fe10472.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Conflicts:
js/lib/geom/geom-obj.js
js/lib/geom/rectangle.js
js/tools/TagTool.js
Diffstat (limited to 'js/components/ui/tree-basic/tree.reel/tree.html')
| -rwxr-xr-x | js/components/ui/tree-basic/tree.reel/tree.html | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/js/components/ui/tree-basic/tree.reel/tree.html b/js/components/ui/tree-basic/tree.reel/tree.html index f0c51fcc..1144b563 100755 --- a/js/components/ui/tree-basic/tree.reel/tree.html +++ b/js/components/ui/tree-basic/tree.reel/tree.html | |||
| @@ -65,9 +65,9 @@ | |||
| 65 | </script> | 65 | </script> |
| 66 | </head> | 66 | </head> |
| 67 | <body> | 67 | <body> |
| 68 | <div id="atree" class="atree"> | 68 | <div data-montage-id="atree" class="atree"> |
| 69 | <ul id="treeView" style="display:block;"> | 69 | <ul data-montage-id="treeView" style="display:block;"> |
| 70 | <li id="treeItem"></li> | 70 | <li data-montage-id="treeItem"></li> |
| 71 | </ul> | 71 | </ul> |
| 72 | </div> | 72 | </div> |
| 73 | </body> | 73 | </body> |