[Pkg-telepathy-commits] [empathy] 10/12: Merge tag 'upstream/3.12.2+76+g800728d' into telepathy1

Simon McVittie smcv at debian.org
Wed May 14 12:06:55 UTC 2014


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

smcv pushed a commit to branch telepathy1
in repository empathy.

commit 63b7deae16d07bc3f340a2c82ff71907e3e14f95
Merge: 6f0ce2a 3fab45d
Author: Simon McVittie <smcv at debian.org>
Date:   Wed May 14 12:01:59 2014 +0100

    Merge tag 'upstream/3.12.2+76+g800728d' into telepathy1
    
    Upstream version 3.12.2+76+g800728d

 ChangeLog                                          |  395 +-
 Makefile.in                                        |    2 +
 NEWS                                               |   23 +
 aclocal.m4                                         |   83 +-
 config.guess                                       |  192 +-
 config.sub                                         |   23 +-
 configure                                          |   48 +-
 configure.ac                                       |    2 +-
 data/Makefile.in                                   |    2 +
 data/empathy.desktop                               |    3 +-
 data/empathy.desktop.in                            |    2 +-
 data/icons/Makefile.in                             |    2 +
 data/themes/Makefile.in                            |    2 +
 goa-mc-plugin/Makefile.in                          |    2 +
 goa-mc-plugin/mcp-account-manager-goa.c            |   17 +-
 help/Makefile.in                                   |    2 +
 help/es/account-jabber.page                        |    2 +-
 help/es/es.po                                      | 1786 +++--
 libempathy-gtk/Makefile.in                         |    2 +
 libempathy-gtk/empathy-chat.c                      |   53 +-
 libempathy-gtk/empathy-individual-store-channel.c  |    2 +-
 libempathy/Makefile.in                             |    2 +
 libempathy/action-chain-internal.h                 |   13 +
 libempathy/empathy-client-factory.c                |    5 +-
 libempathy/empathy-ft-handler.c                    |   28 +-
 libempathy/empathy-tp-chat.c                       |   10 +-
 libempathy/empathy-tp-chat.h                       |    2 +-
 po/be.po                                           |  590 +-
 po/ca at valencia.po                                  |  644 +-
 po/de.po                                           |  584 +-
 po/es.po                                           |   14 +-
 po/id.po                                           |  483 +-
 po/ro.po                                           | 6826 ++++++++++----------
 po/ru.po                                           |   67 +-
 src/Makefile.in                                    |    2 +
 telepathy-account-widgets/aclocal.m4               |   55 +
 telepathy-account-widgets/config.guess             |  192 +-
 telepathy-account-widgets/config.sub               |   23 +-
 telepathy-account-widgets/po/es.po                 |   94 +-
 telepathy-account-widgets/po/id.po                 |  102 +-
 .../tp-account-widgets/tpaw-avatar-chooser.c       |   91 +-
 .../tp-account-widgets/tpaw-pixbuf-utils.c         |    6 +-
 .../tp-account-widgets/tpaw-pixbuf-utils.h         |    4 +-
 tests/Makefile.in                                  |    2 +
 tests/certificates/Makefile.in                     |    2 +
 tests/empathy-tls-test.c                           |    2 -
 tests/interactive/Makefile.in                      |    2 +
 tests/xml/Makefile.in                              |    2 +
 tools/Makefile.in                                  |    2 +
 ubuntu-online-accounts/Makefile.in                 |    2 +
 ubuntu-online-accounts/cc-plugins/Makefile.in      |    2 +
 .../cc-plugins/account-plugins/Makefile.in         |    2 +
 .../cc-plugins/app-plugin/Makefile.in              |    2 +
 .../cc-plugins/providers/Makefile.in               |    2 +
 .../cc-plugins/services/Makefile.in                |    2 +
 ubuntu-online-accounts/mc-plugin/Makefile.in       |    2 +
 .../mc-plugin/mcp-account-manager-uoa.c            |   12 +-
 57 files changed, 6504 insertions(+), 6016 deletions(-)

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



More information about the Pkg-telepathy-commits mailing list