aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Panel.reel/Panel.html
diff options
context:
space:
mode:
authorAnanya Sen2012-06-20 15:20:04 -0700
committerAnanya Sen2012-06-20 15:20:04 -0700
commitcaa9683fd259307658f96190a5c5bd771126fbb8 (patch)
tree83983a8819487ce8b33f65f5d20e34af2df8dd26 /js/panels/Panel.reel/Panel.html
parentd852ea28dad399e84e8d5e69c0293500c30b59f1 (diff)
parentc9852665eadc1acb9c1c881d207c4bd9ef88805f (diff)
downloadninja-caa9683fd259307658f96190a5c5bd771126fbb8.tar.gz
Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste
Diffstat (limited to 'js/panels/Panel.reel/Panel.html')
-rwxr-xr-xjs/panels/Panel.reel/Panel.html2
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": {