aboutsummaryrefslogtreecommitdiff
path: root/js/panels/presets/content.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/presets/content.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/presets/content.reel')
-rw-r--r--js/panels/presets/content.reel/content.html12
1 files changed, 6 insertions, 6 deletions
diff --git a/js/panels/presets/content.reel/content.html b/js/panels/presets/content.reel/content.html
index 27928670..50a48389 100644
--- a/js/panels/presets/content.reel/content.html
+++ b/js/panels/presets/content.reel/content.html
@@ -55,13 +55,13 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
55 </script> 55 </script>
56</head> 56</head>
57<body> 57<body>
58 <section id="presetsPanel" class="presetsPanel"> 58 <section data-montage-id="presetsPanel" class="presetsPanel">
59 <nav id="tab-bar" class="tab-bar"> 59 <nav data-montage-id="tab-bar" class="tab-bar">
60 <div id="styles">Styles</div> 60 <div data-montage-id="styles">Styles</div>
61 <div id="transitions">Transitions</div> 61 <div data-montage-id="transitions">Transitions</div>
62 <div id="animations">Animations</div> 62 <div data-montage-id="animations">Animations</div>
63 </nav> 63 </nav>
64 <div id="librarySlot" class="librarySlot"></div> 64 <div data-montage-id="librarySlot" class="librarySlot"></div>
65 </section> 65 </section>
66</body> 66</body>
67</html> \ No newline at end of file 67</html> \ No newline at end of file