Remove stray merge marker
|
Matthew Wild |
Wed, 03 Dec 2008 16:01:58 +0000 |
Merge from waqas
|
Matthew Wild |
Wed, 03 Dec 2008 15:09:58 +0000 |
config and data directories taken from path, and quoted to allow spaces in path
|
Waqas Hussain |
Wed, 03 Dec 2008 19:57:08 +0500 |
Converted prosody.cfg.lua.dist to use windows end-of-lines
|
Waqas Hussain |
Wed, 03 Dec 2008 19:56:05 +0500 |
Fix license (left some boilerplate in)
|
Matthew Wild |
Wed, 03 Dec 2008 14:59:27 +0000 |
and the C files too
|
Matthew Wild |
Wed, 03 Dec 2008 14:45:03 +0000 |
Insert copyright/license headers
|
Matthew Wild |
Wed, 03 Dec 2008 14:39:07 +0000 |
Fix port number in mod_console instructions
|
Matthew Wild |
Wed, 03 Dec 2008 13:06:23 +0000 |