aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties/zoom-properties.reel/zoom-properties.html
diff options
context:
space:
mode:
authorJonathan Duran2012-05-09 09:58:27 -0700
committerJonathan Duran2012-05-09 09:58:27 -0700
commit48a2a800155fd2d608fb7191c0180cd8f625cd44 (patch)
tree899f9cf1b09a01bc073f92ab498236aed80b38ec /js/components/tools-properties/zoom-properties.reel/zoom-properties.html
parent2ea8a62835f4c20efff2623306e7205e6f5bf0ba (diff)
parentd220c02e246b30509b28a47fa04916ca2b8122e4 (diff)
downloadninja-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/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>