verse
ab0f0326b2b4
squishy

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

Software / code / verse

Comparison

squishy @ 156:ab0f0326b2b4

Merge with Zash
author Matthew Wild <mwild1@gmail.com>
date Sat, 20 Nov 2010 16:33:34 +0000
parent 154:a4dc96890729
parent 155:9c9af7a196ed
child 157:7c47e5639c00
comparison
equal deleted inserted replaced
154:a4dc96890729 156:ab0f0326b2b4
39 Module "verse.plugins.jingle_ft" "plugins/jingle_ft.lua" 39 Module "verse.plugins.jingle_ft" "plugins/jingle_ft.lua"
40 Module "verse.plugins.jingle_s5b" "plugins/jingle_s5b.lua" 40 Module "verse.plugins.jingle_s5b" "plugins/jingle_s5b.lua"
41 Module "verse.plugins.disco" "plugins/disco.lua" 41 Module "verse.plugins.disco" "plugins/disco.lua"
42 Module "verse.plugins.pep" "plugins/pep.lua" 42 Module "verse.plugins.pep" "plugins/pep.lua"
43 Module "verse.plugins.adhoc" "plugins/adhoc.lua" 43 Module "verse.plugins.adhoc" "plugins/adhoc.lua"
44 Module "verse.plugins.private" "plugins/private.lua"
44 45
45 if GetOption "bosh" ~= false then 46 if GetOption "bosh" ~= false then
46 Module "net.httpclient_listener" "net/httpclient_listener.lua" 47 Module "net.httpclient_listener" "net/httpclient_listener.lua"
47 Module "net.connlisteners" "net/connlisteners.lua" 48 Module "net.connlisteners" "net/connlisteners.lua"
48 Module "net.http" "net/http.lua" 49 Module "net.http" "net/http.lua"