diff options
| author | hwc487 | 2012-04-26 13:04:25 -0700 |
|---|---|---|
| committer | hwc487 | 2012-04-26 13:04:25 -0700 |
| commit | 37f2d5230175c0fb9a4792f5e3d804f7604442e1 (patch) | |
| tree | c8260f151270c6bdbe08869ebaeb837777c28d1b /js/controllers/elements/stage-controller.js | |
| parent | f13d0f45f6b449764898e99db309c43b51a33476 (diff) | |
| parent | 902dc18296fc78f3b8e67d952c42981d926bb2fc (diff) | |
| download | ninja-37f2d5230175c0fb9a4792f5e3d804f7604442e1.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Diffstat (limited to 'js/controllers/elements/stage-controller.js')
| -rwxr-xr-x | js/controllers/elements/stage-controller.js | 2 |
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 | }); |