diff options
author | Eric Guzman | 2012-04-02 15:36:08 -0700 |
---|---|---|
committer | Eric Guzman | 2012-04-02 15:36:08 -0700 |
commit | 0241bf331b7e06e206a54be441edf2f4c7261f63 (patch) | |
tree | b7e2f9cad73eed4fc616cf1841cd0be02bd955d4 /js/panels/presets/content.reel/content.html | |
parent | dde5b5054f93db493e5d4d502e677f5781334b08 (diff) | |
parent | c6de22bf42be90b403491b5f87b1818d9020310c (diff) | |
download | ninja-0241bf331b7e06e206a54be441edf2f4c7261f63.tar.gz |
Merge branch 'refs/heads/master' into CSSPanelUpdates
Diffstat (limited to 'js/panels/presets/content.reel/content.html')
-rw-r--r-- | js/panels/presets/content.reel/content.html | 6 |
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> |