[Pkg-telepathy-commits] [telepathy-farstream] 02/03: Merge tag 'upstream/0.6.1' into debian

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian
in repository telepathy-farstream.

commit 0dfbbb53df4195fd22f081d690086e3c53e10e51
Merge: ebe024e 0dd4127
Author: Simon McVittie <smcv at debian.org>
Date:   Wed Apr 2 11:50:02 2014 +0100

    Merge tag 'upstream/0.6.1' into debian
    
    Upstream version 0.6.1

 ChangeLog                                      | 118 +++++
 Makefile.in                                    | 326 +++++++------
 NEWS                                           |   8 +
 aclocal.m4                                     | 624 ++++++++++++++-----------
 config.h.in                                    |  12 +
 configure                                      | 550 +++++++++++++---------
 configure.ac                                   |  29 +-
 doc/Makefile.in                                | 264 ++++++-----
 doc/lib/Makefile.am                            |   2 +-
 doc/lib/Makefile.in                            | 141 +++---
 doc/lib/html/TfChannel.html                    | 132 +++---
 doc/lib/html/TfContent.html                    | 197 ++++----
 doc/lib/html/ch01.html                         |  14 +-
 doc/lib/html/index.html                        |  10 +-
 doc/lib/tmpl/channel.sgml                      | 113 -----
 doc/lib/tmpl/content.sgml                      | 188 --------
 doc/lib/tmpl/telepathy-farstream-unused.sgml   |   0
 examples/Makefile.in                           | 266 ++++++-----
 examples/call-handler.c                        |  13 +-
 examples/python/Makefile.in                    | 101 ++--
 gtk-doc.make                                   |  32 +-
 m4/Makefile.in                                 | 101 ++--
 telepathy-farstream/Makefile.am                |   4 +-
 telepathy-farstream/Makefile.in                | 205 +++++---
 telepathy-farstream/call-channel.c             |   1 +
 telepathy-farstream/call-content.c             |   1 +
 telepathy-farstream/call-stream.c              |   7 +-
 telepathy-farstream/channel.c                  |  10 +-
 telepathy-farstream/content.c                  |   1 +
 telepathy-farstream/media-signalling-channel.c |  12 +-
 telepathy-farstream/media-signalling-content.c |   2 +
 tools/Makefile.in                              | 101 ++--
 32 files changed, 1925 insertions(+), 1660 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-telepathy/telepathy-farstream.git