diff options
| author | Xavier Claessens <xavier.claessens@collabora.co.uk> | 2012-05-09 20:45:36 +0200 |
|---|---|---|
| committer | Xavier Claessens <xavier.claessens@collabora.co.uk> | 2012-05-09 22:06:44 +0200 |
| commit | ebd725a6d90cfdca41d2433e671af79baf68f4f4 (patch) | |
| tree | 929d3dba110cafc4315cf7c7489918b93fb15e9e /telepathy-glib/Makefile.am | |
| parent | f4ad3d7c7bb697d0e4cd73fd88583c375dea643c (diff) | |
| parent | 53cf9df185364f552d60415de885936ed6a51b81 (diff) | |
Merge branch 'master' into next
Conflicts:
configure.ac
docs/reference/telepathy-glib-sections.txt
examples/client/extended-client.c
examples/client/inspect-contact.c
examples/cm/echo-message-parts/chan.c
spec/Protocol_Interface_Presence1.xml
spec/all.xml
telepathy-glib/Makefile.am
telepathy-glib/abi.am
telepathy-glib/base-connection.c
telepathy-glib/base-connection.h
telepathy-glib/connection-contact-list.c
telepathy-glib/contacts-mixin.c
telepathy-glib/intset.c
telepathy-glib/message-mixin.c
telepathy-glib/message-mixin.h
telepathy-glib/stream-tube-channel.c
telepathy-glib/text-channel.c
tests/lib/util.c
Diffstat (limited to 'telepathy-glib/Makefile.am')
| -rw-r--r-- | telepathy-glib/Makefile.am | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/telepathy-glib/Makefile.am b/telepathy-glib/Makefile.am index bf0f9338f..aeba99057 100644 --- a/telepathy-glib/Makefile.am +++ b/telepathy-glib/Makefile.am @@ -126,6 +126,8 @@ tpginclude_HEADERS = \ stream-tube-connection.h \ telepathy-glib.h \ text-channel.h \ + tls-certificate.h \ + tls-certificate-rejection.h \ util.h \ $(NULL) @@ -328,6 +330,9 @@ libtelepathy_glib_main_internal_la_SOURCES = \ stream-tube-connection-internal.h \ stream-tube-connection.c \ text-channel.c \ + tls-certificate.c \ + tls-certificate-rejection.c \ + tls-certificate-rejection-internal.h \ util.c \ util-internal.h |