aboutsummaryrefslogtreecommitdiff
path: root/js/controllers/elements/stage-controller.js
diff options
context:
space:
mode:
authorhwc4872012-04-25 15:54:29 -0700
committerhwc4872012-04-25 15:54:29 -0700
commit34e6aa5a76fb49c3d9251cedf128c6ed971abb5c (patch)
treed506addbd3f15dbe77a881c1956ccf45b5d6eda8 /js/controllers/elements/stage-controller.js
parent1304d00cec00f86442981a276817416ca37086b3 (diff)
parentbcc8f8616f5ad4bf310928da6cbc01da12f6e468 (diff)
downloadninja-34e6aa5a76fb49c3d9251cedf128c6ed971abb5c.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Canvas-interaction
Diffstat (limited to 'js/controllers/elements/stage-controller.js')
-rwxr-xr-xjs/controllers/elements/stage-controller.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/controllers/elements/stage-controller.js b/js/controllers/elements/stage-controller.js
index 3ef7dacc..e9779c81 100755
--- a/js/controllers/elements/stage-controller.js
+++ b/js/controllers/elements/stage-controller.js
@@ -182,5 +182,5 @@ exports.StageController = Montage.create(ElementController, {
182 return dist; 182 return dist;
183 } 183 }
184 } 184 }
185 }, 185 }
186}); 186});