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/treeview/treeview.reel/treeview.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/treeview/treeview.reel/treeview.html')
| -rw-r--r-- | js/components/treeview/treeview.reel/treeview.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/components/treeview/treeview.reel/treeview.html b/js/components/treeview/treeview.reel/treeview.html index 3ef9f116..1bed0f0b 100644 --- a/js/components/treeview/treeview.reel/treeview.html +++ b/js/components/treeview/treeview.reel/treeview.html | |||
| @@ -43,8 +43,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
| 43 | </script> | 43 | </script> |
| 44 | </head> | 44 | </head> |
| 45 | <body> | 45 | <body> |
| 46 | <div id="treeView" class="treeView"> | 46 | <div data-montage-id="treeView" class="treeView"> |
| 47 | <div id="rootBranch" class="treeRoot"></div> | 47 | <div data-montage-id="rootBranch" class="treeRoot"></div> |
| 48 | </div> | 48 | </div> |
| 49 | </body> | 49 | </body> |
| 50 | </html> \ No newline at end of file | 50 | </html> \ No newline at end of file |