diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-10-14 15:35:26 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-10-14 15:35:26 +0100 |
| commit | a8f8a94c917a97c40e8e43997b12290bc9264c09 (patch) | |
| tree | 1a67d2c3334284c157703553d538352af3c3e416 /extensions | |
| parent | 4b7a4f7b487064eca0754d9602505dae12d0033e (diff) | |
| parent | 1108a8aa37c2fa4ef14ad9f5a198ac5f80f2d765 (diff) | |
Merge remote-tracking branch 'wjt/xmpp-console'
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=66085
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Conflicts:
plugins/console/channel.c
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/Gabble_Plugin_Console.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/extensions/Gabble_Plugin_Console.xml b/extensions/Gabble_Plugin_Console.xml index 1e3b52385..a2d94ca0c 100644 --- a/extensions/Gabble_Plugin_Console.xml +++ b/extensions/Gabble_Plugin_Console.xml @@ -23,7 +23,7 @@ <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="true"/> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> - <p>A sidecar interface providing an XMPP console.</p> + <p>A channel type providing an XMPP console.</p> </tp:docstring> <method name="SendIQ" tp:name-for-bindings="Send_IQ"> |