|
Forced merge.
|
Tobias Markmann |
Sat, 29 Nov 2008 11:24:59 +0100 |
|
Use unsigned int instead of uint because uint is already in use on OS X.
|
Tobias Markmann |
Fri, 28 Nov 2008 19:24:08 +0100 |
|
To use free you should include stdlib.h rather than malloc.h according to man page of free() and various C reference websites.
|
Tobias Markmann |
Fri, 28 Nov 2008 18:36:04 +0100 |
|
Do idna_to_ascii when building own response.
|
Tobias Markmann |
Fri, 28 Nov 2008 18:32:54 +0100 |
|
Fix for loading connlisteners when running without CFG_SOURCEDIR
|
Matthew Wild |
Sat, 29 Nov 2008 15:13:30 +0000 |
|
Also look for binary modules in the parent directory when running tests
|
Matthew Wild |
Sat, 29 Nov 2008 03:49:46 +0000 |
|
Automated merge with http://waqas.ath.cx/
|
Matthew Wild |
Sat, 29 Nov 2008 03:28:07 +0000 |
|
Moved incoming c2s presence handling from stanza_router to presencemanager
|
Waqas Hussain |
Sat, 29 Nov 2008 08:25:34 +0500 |
|
Update Makefile to now pass config paths to prosody. Update prosody, modulemanager and connectionlisteners to obey these paths.
|
Matthew Wild |
Sat, 29 Nov 2008 03:27:50 +0000 |
|
Fix for configmanager when config file can't be found
|
Matthew Wild |
Sat, 29 Nov 2008 03:26:46 +0000 |
|
Rename and update config. Update Makefile for this change.
|
Matthew Wild |
Sat, 29 Nov 2008 02:28:00 +0000 |
|
More Makefile improvements
|
Matthew Wild |
Sat, 29 Nov 2008 02:23:48 +0000 |
|
Add a top-level Makefile and ./configure script. Update util-src Makefile for this.
|
Matthew Wild |
Sat, 29 Nov 2008 02:07:33 +0000 |
|
Removing pull_from_master.sh. Use hg fetch instead.
|
Matthew Wild |
Sat, 29 Nov 2008 01:49:23 +0000 |
|
Load prosody instead of main.lia in mod_console
|
Waqas Hussain |
Sat, 29 Nov 2008 06:08:37 +0500 |
