diff options
author | Alon Zakai <alonzakai@gmail.com> | 2013-11-01 18:26:58 -0700 |
---|---|---|
committer | Alon Zakai <alonzakai@gmail.com> | 2013-11-01 18:26:58 -0700 |
commit | 3d48329892cd517b2e709ef94a00df8214169ddd (patch) | |
tree | 988d17b59d4fc2473a6d7a63df0f4117b711bcf4 /src/library_idbfs.js | |
parent | 75af3c1ac8dba93b508b8b431bef9a35e6b054c3 (diff) | |
parent | 2c3d580bf9122ec4aef9ee8d462281d3fd810355 (diff) |
Merge branch 'incoming' into f32
Conflicts:
src/parseTools.js
Diffstat (limited to 'src/library_idbfs.js')
-rw-r--r-- | src/library_idbfs.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/library_idbfs.js b/src/library_idbfs.js index 9031bad8..ab55673f 100644 --- a/src/library_idbfs.js +++ b/src/library_idbfs.js @@ -130,7 +130,7 @@ mergeInto(LibraryManager.library, { }; var toAbsolute = function(root) { return function(p) { - return PATH.join(root, p); + return PATH.join2(root, p); } }; |