Mercurial > lxmppd-hg-xmllex / changelog

No need to comment out s2s in this branch s2s

• Thu, 23 Oct 2008 19:10:16 +0100
• by Matthew Wild <mwild1@gmail.com> [Thu, 23 Oct 2008 19:10:16 +0100] rev 144
• No need to comment out s2s in this branch

Backed out changeset 98e9fea75e5b

• Thu, 23 Oct 2008 18:43:00 +0100
• by Matthew Wild <mwild1@gmail.com> [Thu, 23 Oct 2008 18:43:00 +0100] rev 143
• Backed out changeset 98e9fea75e5b

Backed out changeset 37b3e9ed8918 (again)

• Thu, 23 Oct 2008 18:42:25 +0100
• by Matthew Wild <mwild1@gmail.com> [Thu, 23 Oct 2008 18:42:25 +0100] rev 142
• Backed out changeset 37b3e9ed8918 (again)

Backed out changeset a0fc73d5f48c

• Thu, 23 Oct 2008 18:40:06 +0100
• by Matthew Wild <mwild1@gmail.com> [Thu, 23 Oct 2008 18:40:06 +0100] rev 141
• Backed out changeset a0fc73d5f48c

Backed out changeset 8f17ba74823c

• Thu, 23 Oct 2008 18:39:26 +0100
• by Matthew Wild <mwild1@gmail.com> [Thu, 23 Oct 2008 18:39:26 +0100] rev 140
• Backed out changeset 8f17ba74823c

Reverting stanza_router to non-conflicted version

• Thu, 23 Oct 2008 18:33:10 +0100
• by Matthew Wild <mwild1@gmail.com> [Thu, 23 Oct 2008 18:33:10 +0100] rev 139
• Reverting stanza_router to non-conflicted version

Making the best attempt out of a bad merge from waqas

• Thu, 23 Oct 2008 18:24:55 +0100
• by Matthew Wild <mwild1@gmail.com> [Thu, 23 Oct 2008 18:24:55 +0100] rev 138
• Making the best attempt out of a bad merge from waqas

Added TODO

• Thu, 23 Oct 2008 22:08:19 +0500
• by Waqas Hussain <waqas20@gmail.com> [Thu, 23 Oct 2008 22:08:19 +0500] rev 137
• Added TODO

Merged from Matthew

• Thu, 23 Oct 2008 22:07:36 +0500
• by Waqas Hussain <waqas20@gmail.com> [Thu, 23 Oct 2008 22:07:36 +0500] rev 136
• Merged from Matthew

Merged from Matthew

• Thu, 23 Oct 2008 21:51:00 +0500
• by Waqas Hussain <waqas20@gmail.com> [Thu, 23 Oct 2008 21:51:00 +0500] rev 135
• Merged from Matthew