|
Merge from waqas
|
Matthew Wild |
Fri, 24 Oct 2008 07:57:06 +0100 |
|
Moved some code and removed unnecessary checks.
|
Waqas Hussain |
Fri, 24 Oct 2008 01:06:54 +0500 |
|
Presence fixes (again)
|
Waqas Hussain |
Fri, 24 Oct 2008 00:26:01 +0500 |
|
Merging more s2s
|
Matthew Wild |
Fri, 24 Oct 2008 07:36:48 +0100 |
|
Partial s2s commit
|
Matthew Wild |
Fri, 24 Oct 2008 07:34:13 +0100 |
|
s2s works! \o/ \o/
s2s
|
Matthew Wild |
Fri, 24 Oct 2008 07:27:36 +0100 |
|
working incoming s2s \o/
s2s
|
Matthew Wild |
Fri, 24 Oct 2008 06:13:38 +0100 |
|
working outgoing s2s \o/
s2s
|
Matthew Wild |
Fri, 24 Oct 2008 03:42:26 +0100 |
|
dialback keys now verified
s2s
|
Matthew Wild |
Fri, 24 Oct 2008 03:06:55 +0100 |
|
No need to comment out s2s in this branch
s2s
|
Matthew Wild |
Thu, 23 Oct 2008 19:10:16 +0100 |
|
Backed out changeset 98e9fea75e5b
|
Matthew Wild |
Thu, 23 Oct 2008 18:43:00 +0100 |
|
Backed out changeset 37b3e9ed8918 (again)
|
Matthew Wild |
Thu, 23 Oct 2008 18:42:25 +0100 |
|
Backed out changeset a0fc73d5f48c
|
Matthew Wild |
Thu, 23 Oct 2008 18:40:06 +0100 |
|
Backed out changeset 8f17ba74823c
|
Matthew Wild |
Thu, 23 Oct 2008 18:39:26 +0100 |
|
Reverting stanza_router to non-conflicted version
|
Matthew Wild |
Thu, 23 Oct 2008 18:33:10 +0100 |
|
Making the best attempt out of a bad merge from waqas
|
Matthew Wild |
Thu, 23 Oct 2008 18:24:55 +0100 |
