diff options
| author | Jonathan Duran | 2012-05-09 09:58:27 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-05-09 09:58:27 -0700 |
| commit | 48a2a800155fd2d608fb7191c0180cd8f625cd44 (patch) | |
| tree | 899f9cf1b09a01bc073f92ab498236aed80b38ec /js/components/layout/tools-list.reel/tools-list.html | |
| parent | 2ea8a62835f4c20efff2623306e7205e6f5bf0ba (diff) | |
| parent | d220c02e246b30509b28a47fa04916ca2b8122e4 (diff) | |
| download | ninja-48a2a800155fd2d608fb7191c0180cd8f625cd44.tar.gz | |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Conflicts:
js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
Signed-off-by: Jonathan Duran <jduran@motorola.com>
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> |