diff options
author | Armen Kesablyan | 2012-05-08 16:43:43 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-05-08 16:43:43 -0700 |
commit | dc075ffcc6dd03c090d90fad999eee9b924d56ee (patch) | |
tree | 867f8bdd588c8f9076979233ca46a688ff70523e /js/panels/presets/animations-presets.reel/animations-presets.html | |
parent | 5d7e470351fd150d5e70a97332fa2f2553797499 (diff) | |
parent | 4d949f141247215b5f2a6ec0cfc7d2d31cf2bb1f (diff) | |
download | ninja-dc075ffcc6dd03c090d90fad999eee9b924d56ee.tar.gz |
Merge branch 'refs/heads/dom-architecture' into binding
Conflicts:
js/components/layout/tools-properties.reel/tools-properties.html
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/panels/presets/animations-presets.reel/animations-presets.html')
-rw-r--r-- | js/panels/presets/animations-presets.reel/animations-presets.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/panels/presets/animations-presets.reel/animations-presets.html b/js/panels/presets/animations-presets.reel/animations-presets.html index d333cf97..347e5497 100644 --- a/js/panels/presets/animations-presets.reel/animations-presets.html +++ b/js/panels/presets/animations-presets.reel/animations-presets.html | |||
@@ -48,8 +48,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
48 | </script> | 48 | </script> |
49 | </head> | 49 | </head> |
50 | <body> | 50 | <body> |
51 | <section id="animationsLibrary" class="animationsLibrary"> | 51 | <section data-montage-id="animationsLibrary" class="animationsLibrary"> |
52 | <div id="libraryContainer"></div> | 52 | <div data-montage-id="libraryContainer"></div> |
53 | </section> | 53 | </section> |
54 | </body> | 54 | </body> |
55 | </html> \ No newline at end of file | 55 | </html> \ No newline at end of file |