aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties/eyedropper-properties.reel
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/eyedropper-properties.reel
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/eyedropper-properties.reel')
-rwxr-xr-xjs/components/tools-properties/eyedropper-properties.reel/eyedropper-properties.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/components/tools-properties/eyedropper-properties.reel/eyedropper-properties.html b/js/components/tools-properties/eyedropper-properties.reel/eyedropper-properties.html
index 1cde7a3e..6f420673 100755
--- a/js/components/tools-properties/eyedropper-properties.reel/eyedropper-properties.html
+++ b/js/components/tools-properties/eyedropper-properties.reel/eyedropper-properties.html
@@ -24,7 +24,7 @@
24 </head> 24 </head>
25 25
26 <body> 26 <body>
27 <div id="eyedropperProperties" class="subToolHolderPanel"> 27 <div data-montage-id="eyedropperProperties" class="subToolHolderPanel">
28 </div> 28 </div>
29 </body> 29 </body>
30 30