Comparison

squishy @ 170:cb03e8ae2e30

Merge with Zash
author Matthew Wild <mwild1@gmail.com>
date Wed, 15 Dec 2010 15:03:56 +0000
parent 161:b177bcea2006
child 178:2189f75e09b9
comparison
equal deleted inserted replaced
169:4bb1e9c91fbe 170:cb03e8ae2e30
6 Module "util.logger" "libs/logger.lua" 6 Module "util.logger" "libs/logger.lua"
7 Module "util.sha1" "util/sha1.lua" 7 Module "util.sha1" "util/sha1.lua"
8 Module "lib.adhoc" "libs/adhoc.lib.lua" 8 Module "lib.adhoc" "libs/adhoc.lib.lua"
9 9
10 -- Prosody libraries 10 -- Prosody libraries
11 AutoFetchURL "http://prosody.im/tip/?" 11 if not GetOption("prosody") then
12 AutoFetchURL "http://prosody.im/tip/?"
13 else
14 AutoFetchURL(GetOption("prosody").."/?")
15 end
12 16
13 Module "util.stanza" "util/stanza.lua" 17 Module "util.stanza" "util/stanza.lua"
14 Module "util.timer" "util/timer.lua" 18 Module "util.timer" "util/timer.lua"
15 Module "util.termcolours" "util/termcolours.lua" 19 Module "util.termcolours" "util/termcolours.lua"
16 Module "util.uuid" "util/uuid.lua" 20 Module "util.uuid" "util/uuid.lua"
17 Module "net.dns" "net/dns.lua" 21 Module "net.dns" "net/dns.lua"
18 Module "net.adns" "net/adns.lua" 22 Module "net.adns" "net/adns.lua"
19 Module "net.server" "net/server_select.lua" 23 Module "net.server" "net/server_select.lua"
20 Module "core.xmlhandlers" "core/xmlhandlers.lua" 24 Module "util.xmppstream" "util/xmppstream.lua"
21 Module "util.jid" "util/jid.lua" 25 Module "util.jid" "util/jid.lua"
22 Module "util.events" "util/events.lua" 26 Module "util.events" "util/events.lua"
23 Module "util.dataforms" "util/dataforms.lua" 27 Module "util.dataforms" "util/dataforms.lua"
24 Module "util.ztact" "util/ztact.lua"
25 28
26 -- Verse plugins 29 -- Verse plugins
27 Module "verse.plugins.tls" "plugins/tls.lua" 30 Module "verse.plugins.tls" "plugins/tls.lua"
28 Module "verse.plugins.sasl" "plugins/sasl.lua" 31 Module "verse.plugins.sasl" "plugins/sasl.lua"
29 Module "verse.plugins.bind" "plugins/bind.lua" 32 Module "verse.plugins.bind" "plugins/bind.lua"