diff options
| author | Jose Antonio Marquez | 2012-02-02 18:04:37 -0800 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-02-02 18:04:37 -0800 |
| commit | 7959d2ecc6e8b1799307de1ceab1112b8ab58e8d (patch) | |
| tree | ce4e32578e1af4d49b8375933a6b7edd0a095b0f /node_modules/montage/core/jshint.js | |
| parent | 83ac41dd75ec551cdb03252e0bf3081182517d05 (diff) | |
| parent | c630ead20487c3948fa36448d3e7d5f7b5cba782 (diff) | |
| download | ninja-7959d2ecc6e8b1799307de1ceab1112b8ab58e8d.tar.gz | |
Merge branch 'refs/heads/NinjaInternal' into Color
Conflicts:
js/controllers/elements/shapes-controller.js
js/data/pi/pi-data.js
js/panels/properties/content.reel/content.js
Diffstat (limited to 'node_modules/montage/core/jshint.js')
| -rwxr-xr-x | node_modules/montage/core/jshint.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/node_modules/montage/core/jshint.js b/node_modules/montage/core/jshint.js index 584b5aef..24f18522 100755 --- a/node_modules/montage/core/jshint.js +++ b/node_modules/montage/core/jshint.js | |||
| @@ -3928,7 +3928,7 @@ var JSHINT = (function (setup) { | |||
| 3928 | 3928 | ||
| 3929 | JSHINT.edition = '2011-04-16'; | 3929 | JSHINT.edition = '2011-04-16'; |
| 3930 | 3930 | ||
| 3931 | return itself; | 3931 | return itself; |
| 3932 | }); | 3932 | }); |
| 3933 | 3933 | ||
| 3934 | // Make JSHINT a CommonJS module, if possible. | 3934 | // Make JSHINT a CommonJS module, if possible. |