diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-02-15 13:13:20 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-02-15 13:13:25 +0000 |
| commit | d5b804be02bace138f87272b290ab794e2789a21 (patch) | |
| tree | f99208052cf312384b6b206480d55240b764225d /spec/all.xml | |
| parent | 73e6e3f5d45247a9b5891c95ce05c9b195afaeb4 (diff) | |
| parent | aa64fd15879e30d307aeb360b014ef1338bb11da (diff) | |
Merge branch 'captcha'
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Reviewed-by: Dario Freddi <dario.freddi@collabora.com>
Diffstat (limited to 'spec/all.xml')
| -rw-r--r-- | spec/all.xml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/spec/all.xml b/spec/all.xml index 72e4c491..186fbfc1 100644 --- a/spec/all.xml +++ b/spec/all.xml @@ -5,7 +5,7 @@ <tp:title>Telepathy D-Bus Interface Specification</tp:title> <tp:version>0.25.1.1</tp:version> -<tp:copyright>Copyright © 2005-2011 Collabora Limited</tp:copyright> +<tp:copyright>Copyright © 2005-2012 Collabora Limited</tp:copyright> <tp:copyright>Copyright © 2005-2011 Nokia Corporation</tp:copyright> <tp:copyright>Copyright © 2006 INdT</tp:copyright> @@ -168,6 +168,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <xi:include href="Channel_Interface_Room.xml"/> <xi:include href="Channel_Interface_Room_Config.xml"/> <xi:include href="Channel_Interface_SASL_Authentication.xml"/> + <xi:include href="Channel_Interface_Captcha_Authentication.xml"/> <xi:include href="Channel_Interface_Credentials_Storage.xml"/> <xi:include href="Channel_Interface_Securable.xml"/> <xi:include href="Channel_Interface_Service_Point.xml"/> |