diff options
| author | John Mayhew | 2012-05-07 16:30:19 -0700 |
|---|---|---|
| committer | John Mayhew | 2012-05-07 16:30:19 -0700 |
| commit | db4ba95f50148198759dde503ec1c778184d9dbe (patch) | |
| tree | 8b79ad58108af2f17d15abc8cdc33d35229ab20d /js/panels/presets/animations-presets.reel/animations-presets.html | |
| parent | 843d8ea8ee58a54bcb71d7b28dbf78fae153b491 (diff) | |
| parent | 526e423e4a2734c2b139af23911e912452a4443f (diff) | |
| download | ninja-db4ba95f50148198759dde503ec1c778184d9dbe.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into WorkingBranch
Conflicts:
js/components/layout/tools-list.reel/tools-list.html
js/components/layout/tools-properties.reel/tools-properties.html
js/components/tools-properties/brush-properties.reel/brush-properties.html
js/components/tools-properties/fill-properties.reel/fill-properties.html
js/components/tools-properties/pen-properties.reel/pen-properties.html
js/components/tools-properties/pencil-properties.reel/pencil-properties.html
js/components/tools-properties/selection-properties.reel/selection-properties.html
js/components/tools-properties/shape-properties.reel/shape-properties.html
js/components/tools-properties/tag-properties.reel/tag-properties.html
js/components/tools-properties/text-properties.reel/text-properties.html
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 |