diff options
| author | John Mayhew | 2012-05-07 16:30:19 -0700 |
|---|---|---|
| committer | John Mayhew | 2012-05-07 16:30:19 -0700 |
| commit | db4ba95f50148198759dde503ec1c778184d9dbe (patch) | |
| tree | 8b79ad58108af2f17d15abc8cdc33d35229ab20d /js/components/treeview/branch.reel | |
| parent | 843d8ea8ee58a54bcb71d7b28dbf78fae153b491 (diff) | |
| parent | 526e423e4a2734c2b139af23911e912452a4443f (diff) | |
| download | ninja-db4ba95f50148198759dde503ec1c778184d9dbe.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into WorkingBranch
Conflicts:
js/components/layout/tools-list.reel/tools-list.html
js/components/layout/tools-properties.reel/tools-properties.html
js/components/tools-properties/brush-properties.reel/brush-properties.html
js/components/tools-properties/fill-properties.reel/fill-properties.html
js/components/tools-properties/pen-properties.reel/pen-properties.html
js/components/tools-properties/pencil-properties.reel/pencil-properties.html
js/components/tools-properties/selection-properties.reel/selection-properties.html
js/components/tools-properties/shape-properties.reel/shape-properties.html
js/components/tools-properties/tag-properties.reel/tag-properties.html
js/components/tools-properties/text-properties.reel/text-properties.html
Diffstat (limited to 'js/components/treeview/branch.reel')
| -rw-r--r-- | js/components/treeview/branch.reel/branch.html | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/js/components/treeview/branch.reel/branch.html b/js/components/treeview/branch.reel/branch.html index 97b03382..d3060d96 100644 --- a/js/components/treeview/branch.reel/branch.html +++ b/js/components/treeview/branch.reel/branch.html | |||
| @@ -129,11 +129,11 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
| 129 | </script> | 129 | </script> |
| 130 | </head> | 130 | </head> |
| 131 | <body> | 131 | <body> |
| 132 | <div id="branch" class="branch"> | 132 | <div data-montage-id="branch" class="branch"> |
| 133 | <span id="label" class="branch-label"></span> | 133 | <span data-montage-id="label" class="branch-label"></span> |
| 134 | 134 | ||
| 135 | <ul id="branchList"> | 135 | <ul data-montage-id="branchList"> |
| 136 | <li id="treeItem"></li> | 136 | <li data-montage-id="treeItem"></li> |
| 137 | </ul> | 137 | </ul> |
| 138 | </div> | 138 | </div> |
| 139 | </body> | 139 | </body> |