aboutsummaryrefslogtreecommitdiff
path: root/js/panels/presets/content.reel/content.html
diff options
context:
space:
mode:
authorValerio Virgillito2012-03-19 14:02:24 -0700
committerValerio Virgillito2012-03-19 14:02:24 -0700
commite9c3c7d758fc59ad7b731730dd935170844d9538 (patch)
tree2972d0384605eef4ba1a43636bd48db724f15713 /js/panels/presets/content.reel/content.html
parentcff7deb476f4095d7d3d76c92360617d3316a96f (diff)
parentafe4b3d6567a35586e970682d71cba61c416e496 (diff)
downloadninja-e9c3c7d758fc59ad7b731730dd935170844d9538.tar.gz
Merge branch 'refs/heads/master' into montage-integration
Diffstat (limited to 'js/panels/presets/content.reel/content.html')
-rw-r--r--js/panels/presets/content.reel/content.html6
1 files changed, 3 insertions, 3 deletions
diff --git a/js/panels/presets/content.reel/content.html b/js/panels/presets/content.reel/content.html
index f01e6435..afbdd559 100644
--- a/js/panels/presets/content.reel/content.html
+++ b/js/panels/presets/content.reel/content.html
@@ -62,9 +62,9 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
62<body> 62<body>
63 <section id="presetsPanel" class="presetsPanel"> 63 <section id="presetsPanel" class="presetsPanel">
64 <nav id="tab-bar" class="tab-bar"> 64 <nav id="tab-bar" class="tab-bar">
65 <div id="styles">Style Library</div> 65 <div id="styles">Styles</div>
66 <div id="transitions">Transitions Library</div> 66 <div id="transitions">Transitions</div>
67 <div id="animations">Animations Library</div> 67 <div id="animations">Animations</div>
68 </nav> 68 </nav>
69 <div id="librarySlot" class="librarySlot"></div> 69 <div id="librarySlot" class="librarySlot"></div>
70 </section> 70 </section>