aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties/subselection-properties.reel/subselection-properties.html
diff options
context:
space:
mode:
authorhwc4872012-05-11 13:52:55 -0700
committerhwc4872012-05-11 13:52:55 -0700
commit137bfc9d4c41cc918d969565bec28a834fe10472 (patch)
treee9fa109fc65218f45e386df48b713ff5858f3d62 /js/components/tools-properties/subselection-properties.reel/subselection-properties.html
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/tools-properties/subselection-properties.reel/subselection-properties.html')
-rwxr-xr-xjs/components/tools-properties/subselection-properties.reel/subselection-properties.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/components/tools-properties/subselection-properties.reel/subselection-properties.html b/js/components/tools-properties/subselection-properties.reel/subselection-properties.html
index 79460f93..bde47659 100755
--- a/js/components/tools-properties/subselection-properties.reel/subselection-properties.html
+++ b/js/components/tools-properties/subselection-properties.reel/subselection-properties.html
@@ -24,7 +24,7 @@
24 </head> 24 </head>
25 25
26 <body> 26 <body>
27 <div id="subSelectionProperties"> 27 <div data-montage-id="subSelectionProperties">
28 <div></div> 28 <div></div>
29 </div> 29 </div>
30 </body> 30 </body>