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/layout/tools-list.reel/tools-list.html | |
| 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/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 f559e748..0c51aa9a 100755 --- a/js/components/layout/tools-list.reel/tools-list.html +++ b/js/components/layout/tools-list.reel/tools-list.html | |||
| @@ -154,14 +154,14 @@ | |||
| 154 | </head> | 154 | </head> |
| 155 | 155 | ||
| 156 | <body> | 156 | <body> |
| 157 | <div id="toolsList" class="toolsList"> | 157 | <div data-montage-id="toolsList" class="toolsList"> |
| 158 | <div id="toolscontainer" class="toolscontainer"> | 158 | <div data-montage-id="toolscontainer" class="toolscontainer"> |
| 159 | <div id="toolbutton" class="toolbutton"></div> | 159 | <div data-montage-id="toolbutton" class="toolbutton"></div> |
| 160 | <div id="groupLine"> | 160 | <div data-montage-id="groupLine"> |
| 161 | <hr /> | 161 | <hr /> |
| 162 | </div> | 162 | </div> |
| 163 | </div> | 163 | </div> |
| 164 | <div id="disabledCondition" class="panelDisabled"></div> | 164 | <div data-montage-id="disabledCondition" class="panelDisabled"></div> |
| 165 | </div> | 165 | </div> |
| 166 | 166 | ||
| 167 | </body> | 167 | </body> |