diff options
| author | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2011-03-22 15:31:20 +0000 |
|---|---|---|
| committer | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2011-03-22 15:31:20 +0000 |
| commit | 1343f70de56c6917a224b3c2618eaf654a9fc958 (patch) | |
| tree | ff9b76732f7e93722736f379d4291308e5bdc511 /docs | |
| parent | 916518447065436474ddd0d86462dafa3e28815e (diff) | |
| parent | 901aca41915146f450842d7ab41071d5dd0e4f46 (diff) | |
Merge branch 'meta-porter'
Conflicts:
docs/reference/wocky-docs.sgml
wocky/wocky-debug.h
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/reference/wocky-docs.sgml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/docs/reference/wocky-docs.sgml b/docs/reference/wocky-docs.sgml index f7e2ebf..5314379 100644 --- a/docs/reference/wocky-docs.sgml +++ b/docs/reference/wocky-docs.sgml @@ -31,6 +31,7 @@ <xi:include href="xml/wocky-jabber-auth.xml"/> <xi:include href="xml/wocky-jabber-auth-digest.xml"/> <xi:include href="xml/wocky-jabber-auth-password.xml"/> + <xi:include href="xml/wocky-meta-porter.xml"/> <xi:include href="xml/wocky-muc-enumtypes.xml"/> <xi:include href="xml/wocky-muc.xml"/> <xi:include href="xml/wocky-namespaces.xml"/> |