[Pkg-privacy-commits] [pidgin-otr] 234/255: Merge tag 'upstream/4.0.1-rc1' into experimental

[Ximin Luo]

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

infinity0 pushed a commit to branch experimental
in repository pidgin-otr.

commit e508133eda78904934597d5a52046a9f99faeea9
Merge: 111bb15 2631ce3
Author: intrigeri <intrigeri at boum.org>
Date:   Sat Oct 18 22:32:00 2014 +0000

    Merge tag 'upstream/4.0.1-rc1' into experimental
    
    Upstream version 4.0.1-rc1

 ChangeLog                        |   89 +
 INSTALL                          |    2 +-
 INSTALL.mingw                    |   10 +-
 Makefile.in                      |   88 +-
 Makefile.mingw                   |    6 +-
 NEWS                             |    8 +
 README                           |   19 +-
 aclocal.m4                       | 2845 +++++++++++++++++----------
 ar-lib                           |  265 +++
 config.guess                     |  397 ++--
 config.sub                       |  220 ++-
 configure                        | 3522 +++++++++++++++++++++------------
 configure.ac                     |    4 +-
 depcomp                          |   74 +-
 dialogs.h                        |    4 +-
 gtk-dialog.c                     |    7 +-
 gtk-ui.c                         |    3 +
 ltmain.sh                        | 4016 +++++++++++++++++++++++++-------------
 missing                          |   53 +-
 otr-plugin.c                     |   12 +-
 packaging/fedora/pidgin-otr.spec |  116 +-
 packaging/windows/pidgin-otr.nsi |    6 +-
 po/Makefile.in.in                |   13 +-
 po/cs.po                         |  880 +++++++++
 po/de.po                         |    2 +-
 po/el.po                         |    2 +-
 po/es.po                         |    2 +-
 po/fa.po                         |    2 +-
 po/fi.po                         |  798 ++++++++
 po/fr.po                         |  122 +-
 po/my_MM.po                      |    2 +-
 po/nb_NO.po                      |  809 ++++++++
 po/nl.po                         |    2 +-
 po/nn.po                         |    2 +-
 po/pt_BR.po                      |  808 ++++++++
 po/zh_CN.po                      |    6 +-
 ui.c                             |    3 +
 37 files changed, 11023 insertions(+), 4196 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/pidgin-otr.git