diff options
| author | Armen Kesablyan | 2012-06-20 15:16:30 -0700 |
|---|---|---|
| committer | Armen Kesablyan | 2012-06-20 15:16:30 -0700 |
| commit | 65b989c7759af923fb9456d34bff89f91831ea1e (patch) | |
| tree | e408be732a3eee71229bfc7dbf7cace998ce18de /js/panels/Panel.reel | |
| parent | 38f571d1fdf02d36c3816637af7b2ca2493809da (diff) | |
| parent | fc818d31de267d2b77fda3b3029ad38d48698be8 (diff) | |
| download | ninja-65b989c7759af923fb9456d34bff89f91831ea1e.tar.gz | |
Merge branch 'refs/heads/master' into binding
Conflicts:
node_modules/montage/ui/application.js
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/panels/Panel.reel')
| -rwxr-xr-x | js/panels/Panel.reel/Panel.html | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/js/panels/Panel.reel/Panel.html b/js/panels/Panel.reel/Panel.html index 5937b58f..80fd1a13 100755 --- a/js/panels/Panel.reel/Panel.html +++ b/js/panels/Panel.reel/Panel.html | |||
| @@ -6,6 +6,8 @@ | |||
| 6 | </copyright> --> | 6 | </copyright> --> |
| 7 | <html lang="en"> | 7 | <html lang="en"> |
| 8 | <head> | 8 | <head> |
| 9 | <meta http-equiv="content-type" content="text/html; charset=utf-8" /> | ||
| 10 | |||
| 9 | <script type="text/montage-serialization"> | 11 | <script type="text/montage-serialization"> |
| 10 | { | 12 | { |
| 11 | "Resizer": { | 13 | "Resizer": { |