aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Panel.reel
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-06-20 16:48:34 -0700
committerJose Antonio Marquez2012-06-20 16:48:34 -0700
commit4eff115126ab946c5852d787fd596e07b156c9a5 (patch)
treef7d45b260f2fb5ba5dc4d1879076ca032d5ae2e6 /js/panels/Panel.reel
parent7615da5c6ba54bd082eac4b8a6d9196084e5c590 (diff)
parent392a559e90357d48c910a07617261483b2b45476 (diff)
downloadninja-4eff115126ab946c5852d787fd596e07b156c9a5.tar.gz
Merge branch 'refs/heads/Ninja-Internal' into Color
Diffstat (limited to 'js/panels/Panel.reel')
-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": {