aboutsummaryrefslogtreecommitdiff
path: root/js/components/layout/tools-properties.reel
diff options
context:
space:
mode:
authorJonathan Duran2012-05-11 14:13:07 -0700
committerJonathan Duran2012-05-11 14:13:07 -0700
commit1e2138fc7d0007b0ad3cb4807dc1c9101190f2f2 (patch)
tree2563aa7694c3caaf813ca71ef3250b2a76ee0041 /js/components/layout/tools-properties.reel
parent32257ac142f872d3c1f6c07504bae77ae884ed93 (diff)
parent6fcaa4e923a19672b5860b4c6f67d836680e7e99 (diff)
downloadninja-1e2138fc7d0007b0ad3cb4807dc1c9101190f2f2.tar.gz
Merge branch 'refs/heads/TimelineUber' into TimelineProps
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>