Mercurial > lxmppd-hg-xmllex / changeset
changeset
Merge with 0.7
Fri, 19 Feb 2010 03:31:15 +0000
- author
- Matthew Wild <mwild1@gmail.com>
- date
- Fri, 19 Feb 2010 03:31:15 +0000
- changeset 2677
- 467568f1117d
- parent 2670
- 35f36a53c671 (diff)
- parent 2676
- 4516888fc42d (current diff)
- child 2678
- c5882e2e12b5
Merge with 0.7
--- a/prosody Fri Feb 19 03:30:27 2010 +0000 +++ b/prosody Fri Feb 19 03:31:15 2010 +0000 @@ -22,9 +22,6 @@ package.cpath = CFG_SOURCEDIR.."/?.so;"..package.cpath; end -package.path = package.path..";"..(CFG_SOURCEDIR or ".").."/fallbacks/?.lua"; -package.cpath = package.cpath..";"..(CFG_SOURCEDIR or ".").."/fallbacks/?.so"; - -- Substitute ~ with path to home directory in data path if CFG_DATADIR then if os.getenv("HOME") then
