diff options
| author | Nivesh Rajbhandari | 2012-04-25 15:06:56 -0700 |
|---|---|---|
| committer | Nivesh Rajbhandari | 2012-04-25 15:06:56 -0700 |
| commit | 5e637fc2af6aa86e274d1932f69b61d56360ad27 (patch) | |
| tree | ff4972ad9b2e26decd5a5cf971c1335cb6eba1a1 /js/controllers/elements/stage-controller.js | |
| parent | 7a03f8393b2a8fe4ada75757d967a0af8b649553 (diff) | |
| parent | bcc8f8616f5ad4bf310928da6cbc01da12f6e468 (diff) | |
| download | ninja-5e637fc2af6aa86e274d1932f69b61d56360ad27.tar.gz | |
Merge branch 'refs/heads/ninja-internal' into WebGLMaterials
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 | }); |