aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2014-04-23 00:23:46 +0200
committerKim Alvefur <zash@zash.se>2014-04-23 00:23:46 +0200
commit9ac3675494a9bf1c40781ef2c7954ba9c1993049 (patch)
treeeb9fb622a0d716a1b827a9d7530a073ac57cb5ab /tools
parent36661ad7ac28934b50b14c82c89f2be126da34d4 (diff)
parent6316aef5bb993b6d3c6d21d6a4068a540f8c816c (diff)
downloadprosody-9ac3675494a9bf1c40781ef2c7954ba9c1993049.tar.gz
prosody-9ac3675494a9bf1c40781ef2c7954ba9c1993049.zip
Merge 0.10->trunk
Diffstat (limited to 'tools')
-rw-r--r--tools/jabberd14sql2prosody.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/jabberd14sql2prosody.lua b/tools/jabberd14sql2prosody.lua
index 03376b30..e43dc296 100644
--- a/tools/jabberd14sql2prosody.lua
+++ b/tools/jabberd14sql2prosody.lua
@@ -428,7 +428,7 @@ end
end
-- import modules
-package.path = package.path.."..\?.lua;";
+package.path = package.path..";../?.lua;";
local my_name = arg[0];
if my_name:match("[/\\]") then