aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties/zoom-properties.reel/zoom-properties.html
diff options
context:
space:
mode:
authorJohn Mayhew2012-05-07 16:30:19 -0700
committerJohn Mayhew2012-05-07 16:30:19 -0700
commitdb4ba95f50148198759dde503ec1c778184d9dbe (patch)
tree8b79ad58108af2f17d15abc8cdc33d35229ab20d /js/components/tools-properties/zoom-properties.reel/zoom-properties.html
parent843d8ea8ee58a54bcb71d7b28dbf78fae153b491 (diff)
parent526e423e4a2734c2b139af23911e912452a4443f (diff)
downloadninja-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/tools-properties/zoom-properties.reel/zoom-properties.html')
-rwxr-xr-xjs/components/tools-properties/zoom-properties.reel/zoom-properties.html6
1 files changed, 3 insertions, 3 deletions
diff --git a/js/components/tools-properties/zoom-properties.reel/zoom-properties.html b/js/components/tools-properties/zoom-properties.reel/zoom-properties.html
index e36d7ca7..cf22b775 100755
--- a/js/components/tools-properties/zoom-properties.reel/zoom-properties.html
+++ b/js/components/tools-properties/zoom-properties.reel/zoom-properties.html
@@ -26,10 +26,10 @@
26 </head> 26 </head>
27 27
28 <body> 28 <body>
29 <div id="zoomProperties" class="subToolHolderPanel"> 29 <div data-montage-id="zoomProperties" class="subToolHolderPanel">
30 <div id="zoomToolOptionHolder" class="subToolButton"> 30 <div id="zoomToolOptionHolder" class="subToolButton">
31 <input id="zoomInTool" type="radio" name="zoomRadio" class="zoom-option" title="Zoom In"checked/> 31 <input data-montage-id="zoomInTool" id="zoomInTool" type="radio" name="zoomRadio" class="zoom-option" title="Zoom In"checked/>
32 <input id="zoomOutTool" type="radio" name="zoomRadio" title="Zoom Out" class="zoom-option"/> 32 <input data-montage-id="zoomOutTool" id="zoomOutTool" type="radio" name="zoomRadio" title="Zoom Out" class="zoom-option"/>
33 </div> 33 </div>
34 </div> 34 </div>
35 </body> 35 </body>