aboutsummaryrefslogtreecommitdiff
path: root/js/components/layout/tools-properties.reel
diff options
context:
space:
mode:
authorhwc4872012-05-11 13:52:55 -0700
committerhwc4872012-05-11 13:52:55 -0700
commit137bfc9d4c41cc918d969565bec28a834fe10472 (patch)
treee9fa109fc65218f45e386df48b713ff5858f3d62 /js/components/layout/tools-properties.reel
parentd21aaca3d7093b6af968b7f9f764ab54e004f02b (diff)
parent27f4cacb39de1c2e3910748dadc9fc16d0655480 (diff)
downloadninja-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-properties.reel')
-rwxr-xr-xjs/components/layout/tools-properties.reel/tools-properties.html36
1 files changed, 18 insertions, 18 deletions
diff --git a/js/components/layout/tools-properties.reel/tools-properties.html b/js/components/layout/tools-properties.reel/tools-properties.html
index 8dd0f713..10309ec4 100755
--- a/js/components/layout/tools-properties.reel/tools-properties.html
+++ b/js/components/layout/tools-properties.reel/tools-properties.html
@@ -171,24 +171,24 @@
171 </head> 171 </head>
172 172
173 <body> 173 <body>
174 <div id="toolsProperties" class="panelBackground"> 174 <div data-montage-id="toolsProperties" class="panelBackground">
175 <div id="selectionProperties"></div> 175 <div data-montage-id="selectionProperties"></div>
176 <div id="subSelectionProperties"></div> 176 <div data-montage-id="subSelectionProperties"></div>
177 <div id="object3DProperties"></div> 177 <div data-montage-id="object3DProperties"></div>
178 <div id="tagProperties"></div> 178 <div data-montage-id="tagProperties"></div>
179 <div id="penProperties"></div> 179 <div data-montage-id="penProperties"></div>
180 <div id="textProperties"></div> 180 <div data-montage-id="textProperties"></div>
181 <div id="shapeProperties"></div> 181 <div data-montage-id="shapeProperties"></div>
182 <div id="pencilProperties"></div> 182 <div data-montage-id="pencilProperties"></div>
183 <div id="brushProperties"></div> 183 <div data-montage-id="brushProperties"></div>
184 <div id="fillProperties"></div> 184 <div data-montage-id="fillProperties"></div>
185 <div id="inkbottleProperties"></div> 185 <div data-montage-id="inkbottleProperties"></div>
186 <div id="eyedropperProperties"></div> 186 <div data-montage-id="eyedropperProperties"></div>
187 <div id="eraserProperties"></div> 187 <div data-montage-id="eraserProperties"></div>
188 <div id="rotateStageProperties"></div> 188 <div data-montage-id="rotateStageProperties"></div>
189 <div id="panProperties"></div> 189 <div data-montage-id="panProperties"></div>
190 <div id="zoomProperties"></div> 190 <div data-montage-id="zoomProperties"></div>
191 <div id="disabledCondition" class="panelDisabled"></div> 191 <div data-montage-id="disabledCondition" class="panelDisabled"></div>
192 </div> 192 </div>
193 </body> 193 </body>
194</html> 194</html>