aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorWaqas Hussain <waqas20@gmail.com>2009-11-23 21:02:06 +0500
committerWaqas Hussain <waqas20@gmail.com>2009-11-23 21:02:06 +0500
commit82c595c85bd5ea8bf9dc116e3e1b9f01a56f8619 (patch)
treeb562c8f53fe7471ad6d62bccc9f3a72e3cfa1e0e /prosody
parenta1cca576be8eeb34d63963f14785445d99bc355f (diff)
parent5b41760cecdfd2db66b84ce92454dd61e7f1341b (diff)
downloadprosody-82c595c85bd5ea8bf9dc116e3e1b9f01a56f8619.tar.gz
prosody-82c595c85bd5ea8bf9dc116e3e1b9f01a56f8619.zip
Merged with 0.6.
Diffstat (limited to 'prosody')
-rwxr-xr-xprosody8
1 files changed, 4 insertions, 4 deletions
diff --git a/prosody b/prosody
index ae9cd2fc..8dd37f30 100755
--- a/prosody
+++ b/prosody
@@ -14,7 +14,7 @@ CFG_CONFIGDIR=os.getenv("PROSODY_CFGDIR");
CFG_PLUGINDIR=os.getenv("PROSODY_PLUGINDIR");
CFG_DATADIR=os.getenv("PROSODY_DATADIR");
--- -- -- -- -- -- -- ---- -- -- -- -- -- -- -- --
+-- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
if CFG_SOURCEDIR then
package.path = CFG_SOURCEDIR.."/?.lua;"..package.path;
@@ -82,13 +82,13 @@ function read_config()
end
function load_libraries()
- --- Initialize logging
+ -- Initialize logging
require "core.loggingmanager"
- --- Check runtime dependencies
+ -- Check runtime dependencies
require "util.dependencies"
- --- Load socket framework
+ -- Load socket framework
server = require "net.server"
end