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/url.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/url.js')
| -rw-r--r-- | node_modules/montage/core/url.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/node_modules/montage/core/url.js b/node_modules/montage/core/url.js index 3f529e35..24e55934 100644 --- a/node_modules/montage/core/url.js +++ b/node_modules/montage/core/url.js | |||
| @@ -11,7 +11,7 @@ | |||
| 11 | if (typeof bootstrap !== "undefined") { | 11 | if (typeof bootstrap !== "undefined") { |
| 12 | bootstrap("core/url", definition); | 12 | bootstrap("core/url", definition); |
| 13 | } else { | 13 | } else { |
| 14 | bootstrap(require, exports); | 14 | definition(require, exports); |
| 15 | } | 15 | } |
| 16 | })(function (require, exports) { | 16 | })(function (require, exports) { |
| 17 | 17 | ||