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/layout/tools-list.reel/tools-list.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/layout/tools-list.reel/tools-list.html')
| -rwxr-xr-x | js/components/layout/tools-list.reel/tools-list.html | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/js/components/layout/tools-list.reel/tools-list.html b/js/components/layout/tools-list.reel/tools-list.html index acee20b2..9aa05e5d 100755 --- a/js/components/layout/tools-list.reel/tools-list.html +++ b/js/components/layout/tools-list.reel/tools-list.html | |||
| @@ -162,16 +162,16 @@ | |||
| 162 | </head> | 162 | </head> |
| 163 | 163 | ||
| 164 | <body> | 164 | <body> |
| 165 | <div id="toolsList" class="toolsList"> | 165 | <div data-montage-id="toolsList" class="toolsList"> |
| 166 | <div id="toolscontainer" class="toolscontainer"> | 166 | <div data-montage-id="toolscontainer" class="toolscontainer"> |
| 167 | <div id="toolbutton" class="toolbutton"></div> | 167 | <div data-montage-id="toolbutton" class="toolbutton"></div> |
| 168 | <div id="groupLine"> | 168 | <div data-montage-id="groupLine"> |
| 169 | <hr /> | 169 | <hr /> |
| 170 | </div> | 170 | </div> |
| 171 | </div> | 171 | </div> |
| 172 | <!-- TODO: Remove and add as a component --> | 172 | <!-- TODO: Remove and add as a component --> |
| 173 | <div id="colortoolbar"></div> | 173 | <div id="colortoolbar"></div> |
| 174 | <div id="disabledCondition" class="panelDisabled"></div> | 174 | <div data-montage-id="disabledCondition" class="panelDisabled"></div> |
| 175 | </div> | 175 | </div> |
| 176 | 176 | ||
| 177 | </body> | 177 | </body> |