verse
82ad158714e5
squishy

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / verse

Comparison

squishy @ 399:82ad158714e5

Merge with Zash
author Matthew Wild <mwild1@gmail.com>
date Tue, 12 Jan 2016 13:14:36 +0000
parent 377:9aa5bce207b2
parent 397:918829f384d6
child 416:92ce569b9b73
comparison
equal deleted inserted replaced
378:6042c938e369 399:82ad158714e5
4 Module "util.encodings" "libs/encodings.lua" 4 Module "util.encodings" "libs/encodings.lua"
5 Module "util.hashes" "libs/hashes.lua" 5 Module "util.hashes" "libs/hashes.lua"
6 Module "util.sha1" "util/sha1.lua" 6 Module "util.sha1" "util/sha1.lua"
7 Module "lib.adhoc" "libs/adhoc.lib.lua" 7 Module "lib.adhoc" "libs/adhoc.lib.lua"
8 8
9 AutoFetchURL("http://hg.prosody.im/prosody-modules/raw-file/tip/mod_mam/?");
10 Module "util.rsm" "rsm.lib.lua"
11 -- Prosody libraries 9 -- Prosody libraries
12 if not GetOption("prosody") then 10 if not GetOption("prosody") then
13 AutoFetchURL "http://hg.prosody.im/0.9/raw-file/tip/?" 11 AutoFetchURL "http://hg.prosody.im/0.9/raw-file/0.9.9/?"
14 else 12 else
15 AutoFetchURL(GetOption("prosody").."/?") 13 AutoFetchURL(GetOption("prosody").."/?")
16 end 14 end
17 15
18 Module "util.stanza" "util/stanza.lua" 16 Module "util.stanza" "util/stanza.lua"
28 Module "util.dataforms" "util/dataforms.lua" 26 Module "util.dataforms" "util/dataforms.lua"
29 Module "util.caps" "util/caps.lua" 27 Module "util.caps" "util/caps.lua"
30 Module "util.vcard" "util/vcard.lua" 28 Module "util.vcard" "util/vcard.lua"
31 Module "util.logger" "util/logger.lua" 29 Module "util.logger" "util/logger.lua"
32 Module "util.datetime" "util/datetime.lua" 30 Module "util.datetime" "util/datetime.lua"
33 Module "util.ip" "util/ip.lua" 31 Module "util.json" "util/json.lua"
32 Module "util.xml" "util/xml.lua"
33 Module "util.rsm" "util/rsm.lua"
34 Module "util.random" "util/random.lua"
35 Module "util.ip" "util/ip.lua"
34 36
35 Module "util.sasl.scram" "util/sasl/scram.lua" 37 Module "util.sasl.scram" "util/sasl/scram.lua"
36 Module "util.sasl.plain" "util/sasl/plain.lua" 38 Module "util.sasl.plain" "util/sasl/plain.lua"
37 Module "util.sasl.anonymous" "util/sasl/anonymous.lua" 39 Module "util.sasl.anonymous" "util/sasl/anonymous.lua"
38 40