diff options
| author | Jose Antonio Marquez | 2012-02-02 18:00:45 -0800 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-02-02 18:00:45 -0800 |
| commit | 04d89daed90c35a4393773ca2e2d0ac3a4c15cd4 (patch) | |
| tree | d0041abc7379ef38b20cce148e5dea6f531b8569 /node_modules/montage/core/url.js | |
| parent | 4d8306b638c53899403a4f0328c02bf1ab893e8f (diff) | |
| parent | c630ead20487c3948fa36448d3e7d5f7b5cba782 (diff) | |
| download | ninja-04d89daed90c35a4393773ca2e2d0ac3a4c15cd4.tar.gz | |
Merge branch 'refs/heads/NinjaInternal' into FileIO
Conflicts:
.gitignore
js/ninja.reel/ninja.js
Diffstat (limited to 'node_modules/montage/core/url.js')
| -rwxr-xr-x | 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 100755 --- 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 | ||