diff options
author | Ananya Sen | 2012-02-03 09:57:41 -0800 |
---|---|---|
committer | Ananya Sen | 2012-02-03 09:57:41 -0800 |
commit | c093dd13a84ce6eb3e00a672c38a808093c5d966 (patch) | |
tree | 5dfd4a800bbbe02a8cbcb3ffeee542686bc258bb /node_modules/montage/core/url.js | |
parent | 79b0173eeca079dec42ff1480182656dbe3af44f (diff) | |
parent | 8e06b63e5eab5558823f4923e20a832c8b36cbe2 (diff) | |
download | ninja-c093dd13a84ce6eb3e00a672c38a808093c5d966.tar.gz |
Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIO
Conflicts:
js/io/document/document-controller.js
js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js
js/io/ui/save-as-dialog.reel/save-as-dialog.js
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
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 | ||