[Pkg-telepathy-commits] [telepathy-glib] 53/60: Merge branch 'upstream-experimental' into upstream
Simon McVittie
smcv at alioth.debian.org
Tue Sep 24 16:21:08 UTC 2013
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to branch debian
in repository telepathy-glib.
commit 2dcff588ba829374b1e37187e22fba30193c5ae2
Merge: 7f21b2a 6cc81ef
Author: Simon McVittie <smcv at debian.org>
Date: Tue Sep 24 16:23:21 2013 +0100
Merge branch 'upstream-experimental' into upstream
Conflicts:
ChangeLog
NEWS
aclocal.m4
configure
configure.ac
docs/reference/html/index.html
docs/reference/html/telepathy-glib-TpPresenceMixin.html
docs/reference/html/telepathy-glib-asv.html
docs/reference/html/telepathy-glib-svc-account-manager.html
docs/reference/html/telepathy-glib-svc-account.html
docs/reference/html/telepathy-glib-svc-anonymity.html
docs/reference/html/telepathy-glib-svc-channel-auth.html
docs/reference/html/telepathy-glib-svc-channel-call.html
docs/reference/html/telepathy-glib-svc-channel-contactsearch.html
docs/reference/html/telepathy-glib-svc-channel-dispatch-operation.html
docs/reference/html/telepathy-glib-svc-channel-dispatcher.html
docs/reference/html/telepathy-glib-svc-channel-file-transfer.html
docs/reference/html/telepathy-glib-svc-channel-media.html
docs/reference/html/telepathy-glib-svc-channel-request.html
docs/reference/html/telepathy-glib-svc-channel-roomlist.html
docs/reference/html/telepathy-glib-svc-channel-text.html
docs/reference/html/telepathy-glib-svc-channel-tube.html
docs/reference/html/telepathy-glib-svc-channel-tubes.html
docs/reference/html/telepathy-glib-svc-channel.html
docs/reference/html/telepathy-glib-svc-connection-manager.html
docs/reference/html/telepathy-glib-svc-connection.html
docs/reference/html/telepathy-glib-svc-debug.html
docs/reference/html/telepathy-glib-svc-generic.html
docs/reference/html/telepathy-glib-svc-media-interfaces.html
docs/reference/html/telepathy-glib-svc-service-point.html
docs/reference/html/telepathy-glib-svc-tls.html
docs/reference/html/telepathy-glib-util.html
docs/reference/html/telepathy-glib-version.html
docs/reference/version.xml
ChangeLog | 512 ++++++-
Makefile.am | 2 +-
Makefile.in | 4 +-
NEWS | 50 +-
README | 3 +
aclocal.m4 | 32 -
configure | 39 +-
configure.ac | 17 +-
docs/reference/Makefile.am | 12 +-
docs/reference/Makefile.in | 12 +-
docs/reference/html/TpBaseRoomConfig.html | 3 +-
docs/reference/html/index.html | 4 +-
docs/reference/html/index.sgml | 157 ++-
.../html/telepathy-glib-TpPresenceMixin.html | 4 +-
docs/reference/html/telepathy-glib-account.html | 40 +-
docs/reference/html/telepathy-glib-asv.html | 2 +-
.../html/telepathy-glib-connection-manager.html | 3 +-
docs/reference/html/telepathy-glib-contact.html | 3 +-
.../html/telepathy-glib-dbus-properties-mixin.html | 3 +-
docs/reference/html/telepathy-glib-dbus.html | 3 +-
docs/reference/html/telepathy-glib-enums.html | 306 ++--
docs/reference/html/telepathy-glib-errors.html | 165 +--
docs/reference/html/telepathy-glib-gtypes.html | 462 +++----
docs/reference/html/telepathy-glib-proxy.html | 3 +-
.../html/telepathy-glib-svc-account-manager.html | 67 +
.../reference/html/telepathy-glib-svc-account.html | 82 ++
.../html/telepathy-glib-svc-anonymity.html | 31 +
.../html/telepathy-glib-svc-channel-auth.html | 71 +
.../html/telepathy-glib-svc-channel-call.html | 1454 ++++++++++++++++++--
.../telepathy-glib-svc-channel-contactsearch.html | 70 +
...epathy-glib-svc-channel-dispatch-operation.html | 67 +
.../telepathy-glib-svc-channel-dispatcher.html | 66 +
.../telepathy-glib-svc-channel-file-transfer.html | 129 ++
.../html/telepathy-glib-svc-channel-group.html | 363 +++++
.../html/telepathy-glib-svc-channel-media.html | 391 ++++++
.../html/telepathy-glib-svc-channel-request.html | 106 ++
.../html/telepathy-glib-svc-channel-roomlist.html | 61 +
.../html/telepathy-glib-svc-channel-text.html | 373 +++++
.../html/telepathy-glib-svc-channel-tube.html | 179 +++
.../html/telepathy-glib-svc-channel-tubes.html | 198 +++
.../reference/html/telepathy-glib-svc-channel.html | 26 +
.../telepathy-glib-svc-connection-manager.html | 41 +
.../html/telepathy-glib-svc-connection.html | 1305 +++++++++++++++---
docs/reference/html/telepathy-glib-svc-debug.html | 46 +
.../reference/html/telepathy-glib-svc-generic.html | 100 ++
.../html/telepathy-glib-svc-media-interfaces.html | 511 +++++++
.../html/telepathy-glib-svc-service-point.html | 60 +
docs/reference/html/telepathy-glib-svc-tls.html | 56 +
docs/reference/html/telepathy-glib-util.html | 12 +-
docs/reference/html/telepathy-glib-version.html | 15 +-
docs/reference/html/telepathy-glib.devhelp2 | 160 ++-
docs/reference/telepathy-glib-docs.sgml | 2 -
docs/reference/telepathy-glib-sections.txt | 1 +
docs/reference/telepathy-glib.types | 101 ++
docs/reference/version.xml | 2 +-
examples/client/dbus-tubes/accepter.c | 2 +
examples/client/dbus-tubes/offerer.c | 2 +
examples/client/js/Makefile.am | 4 +-
examples/client/js/Makefile.in | 4 +-
examples/client/js/debug-client.js | 238 ++++
examples/client/python/ft-handler.py | 2 -
examples/client/stream-tubes/accepter.c | 2 +
examples/client/stream-tubes/offerer.c | 2 +
examples/cm/call/Makefile.am | 2 +-
examples/cm/call/Makefile.in | 2 +-
examples/cm/call/call-channel.c | 2 +
examples/cm/channelspecific/Makefile.am | 2 +-
examples/cm/channelspecific/Makefile.in | 2 +-
examples/cm/contactlist/Makefile.am | 2 +-
examples/cm/contactlist/Makefile.in | 2 +-
examples/cm/echo-message-parts/Makefile.am | 2 +-
examples/cm/echo-message-parts/Makefile.in | 2 +-
examples/cm/extended/Makefile.am | 2 +-
examples/cm/extended/Makefile.in | 2 +-
examples/cm/no-protocols/Makefile.am | 2 +-
examples/cm/no-protocols/Makefile.in | 2 +-
examples/extensions/Makefile.am | 4 +-
examples/extensions/Makefile.in | 4 +-
telepathy-glib/Makefile.in | 4 +-
telepathy-glib/TelepathyGLib-0.12.gir | 33 +-
telepathy-glib/account.c | 82 +-
telepathy-glib/call-stream-endpoint.c | 2 +-
telepathy-glib/codegen.am | 2 +-
telepathy-glib/connection-contact-info.c | 1 -
telepathy-glib/connection-manager.c | 29 +-
telepathy-glib/connection.c | 3 +
telepathy-glib/defs.h | 15 +
telepathy-glib/extra-gtkdoc.h | 7 +
telepathy-glib/group-mixin.c | 12 +-
telepathy-glib/introspection.am | 2 +-
telepathy-glib/properties-mixin.c | 25 +-
telepathy-glib/protocol.c | 4 +-
telepathy-glib/telepathy-glib-uninstalled.pc.in | 1 -
telepathy-glib/telepathy-glib.pc.in | 1 -
telepathy-glib/text-channel.c | 12 +-
telepathy-glib/util.c | 2 +
telepathy-glib/util.h | 12 +
tests/dbus/Makefile.am | 4 +-
tests/dbus/Makefile.in | 4 +-
tests/dbus/account.c | 38 +-
tests/dbus/call-channel.c | 2 +
tests/dbus/cm.c | 76 +-
tests/dbus/contacts.c | 24 +-
tests/lib/simple-account.c | 50 +-
tests/lib/simple-account.h | 3 +
tests/util-cxx.cpp | 2 +
tools/c-constants-gen.py | 12 +-
tools/glib-client-gen.py | 18 +-
tools/glib-client-marshaller-gen.py | 20 +-
tools/glib-errors-check-gen.py | 62 +-
tools/glib-errors-str-gen.py | 14 +-
tools/glib-ginterface-gen.py | 22 +-
tools/glib-gtypes-generator.py | 14 +-
tools/glib-interfaces-gen.py | 14 +-
tools/gobject-foo.py | 2 +-
tools/lcov.am | 2 +-
tools/libglibcodegen.py | 4 +-
tools/libtpcodegen.py | 22 +-
tools/make-version-script.py | 32 +-
tools/xincludator.py | 13 +-
120 files changed, 7575 insertions(+), 1405 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-telepathy/telepathy-glib.git
More information about the Pkg-telepathy-commits
mailing list