aboutsummaryrefslogtreecommitdiff
path: root/js/panels/properties.reel/section.reel
diff options
context:
space:
mode:
authorhwc4872012-05-11 13:52:55 -0700
committerhwc4872012-05-11 13:52:55 -0700
commit137bfc9d4c41cc918d969565bec28a834fe10472 (patch)
treee9fa109fc65218f45e386df48b713ff5858f3d62 /js/panels/properties.reel/section.reel
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/panels/properties.reel/section.reel')
-rwxr-xr-xjs/panels/properties.reel/section.reel/section.html6
1 files changed, 3 insertions, 3 deletions
diff --git a/js/panels/properties.reel/section.reel/section.html b/js/panels/properties.reel/section.reel/section.html
index e6f68751..c9b14565 100755
--- a/js/panels/properties.reel/section.reel/section.html
+++ b/js/panels/properties.reel/section.reel/section.html
@@ -36,12 +36,12 @@
36 </script> 36 </script>
37</head> 37</head>
38<body> 38<body>
39 <div id="section"> 39 <div data-montage-id="section">
40 <h2 id="sectionSplitter" class="subSectionHeader"> 40 <h2 data-montage-id="sectionSplitter" class="subSectionHeader">
41 <section class="arrow"><div class="arrowIcon animated"></div></section> 41 <section class="arrow"><div class="arrowIcon animated"></div></section>
42 <section class="title"></section> 42 <section class="title"></section>
43 </h2> 43 </h2>
44 <div id="sectionSlot" class="animated"></div> 44 <div data-montage-id="sectionSlot" class="animated"></div>
45 </div> 45 </div>
46</body> 46</body>
47</html> \ No newline at end of file 47</html> \ No newline at end of file