Diff

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
line wrap: on
line diff
--- a/squishy	Sat Jan 09 11:03:30 2016 +0000
+++ b/squishy	Tue Jan 12 13:14:36 2016 +0000
@@ -6,11 +6,9 @@
 Module "util.sha1"		"util/sha1.lua"
 Module "lib.adhoc"              "libs/adhoc.lib.lua"
 
-AutoFetchURL("http://hg.prosody.im/prosody-modules/raw-file/tip/mod_mam/?");
-Module "util.rsm"       "rsm.lib.lua"
 -- Prosody libraries
 if not GetOption("prosody") then
-	AutoFetchURL "http://hg.prosody.im/0.9/raw-file/tip/?"
+	AutoFetchURL "http://hg.prosody.im/0.9/raw-file/0.9.9/?"
 else
 	AutoFetchURL(GetOption("prosody").."/?")
 end
@@ -30,7 +28,11 @@
 Module "util.vcard"		"util/vcard.lua"
 Module "util.logger"		"util/logger.lua"
 Module "util.datetime"		"util/datetime.lua"
-Module "util.ip"		"util/ip.lua"
+Module "util.json"		"util/json.lua"
+Module "util.xml"		"util/xml.lua"
+Module "util.rsm"       "util/rsm.lua"
+Module "util.random"       "util/random.lua"
+Module "util.ip"       "util/ip.lua"
 
 Module "util.sasl.scram" "util/sasl/scram.lua"
 Module "util.sasl.plain" "util/sasl/plain.lua"