diff options
| author | Jonathan Duran | 2012-06-20 15:04:45 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-06-20 15:04:45 -0700 |
| commit | c6ae80c488621d4ac189cb63309b6258115f823a (patch) | |
| tree | dfa26112e1830972fcb212bbb5b17c9a901c645f /js/panels/Panel.reel | |
| parent | 022e714cb5d10cd8575ab9907eddfb184a990b66 (diff) | |
| parent | c9852665eadc1acb9c1c881d207c4bd9ef88805f (diff) | |
| download | ninja-c6ae80c488621d4ac189cb63309b6258115f823a.tar.gz | |
Merge branch 'refs/heads/NINJAmaster' into Timeline-merge-candidate
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": { |