aboutsummaryrefslogtreecommitdiff
path: root/js/panels/objects/object.reel
diff options
context:
space:
mode:
authorhwc4872012-07-09 16:08:02 -0700
committerhwc4872012-07-09 16:08:02 -0700
commit5085d0f67df89a21715308956004164597a6ba79 (patch)
tree2c896163143a66331205a39b0a3b1b45d51bf12a /js/panels/objects/object.reel
parent51f1691f792dbda9b740ded8aa0457c9406db156 (diff)
parent84b3327bd92faafab7954b5eb64c7abe24a3fe13 (diff)
downloadninja-5085d0f67df89a21715308956004164597a6ba79.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into GridFixes
Conflicts: js/helper-classes/3D/StageLine.js
Diffstat (limited to 'js/panels/objects/object.reel')
-rw-r--r--js/panels/objects/object.reel/object.html2
-rw-r--r--js/panels/objects/object.reel/object.js2
2 files changed, 2 insertions, 2 deletions
diff --git a/js/panels/objects/object.reel/object.html b/js/panels/objects/object.reel/object.html
index 4ce3cfda..2ea28d46 100644
--- a/js/panels/objects/object.reel/object.html
+++ b/js/panels/objects/object.reel/object.html
@@ -1,4 +1,4 @@
1<!DOCTYPE html> 1<!doctype html>
2<!-- <copyright> 2<!-- <copyright>
3Copyright (c) 2012, Motorola Mobility, Inc 3Copyright (c) 2012, Motorola Mobility, Inc
4All Rights Reserved. 4All Rights Reserved.
diff --git a/js/panels/objects/object.reel/object.js b/js/panels/objects/object.reel/object.js
index a4c1bd5e..f97603e4 100644
--- a/js/panels/objects/object.reel/object.js
+++ b/js/panels/objects/object.reel/object.js
@@ -85,7 +85,7 @@ exports.Object = Montage.create(Component, {
85 85
86 this.needsDraw = true; 86 this.needsDraw = true;
87 } 87 }
88 88
89 }, 89 },
90 90
91 _montageMetaData : { 91 _montageMetaData : {