[Pkg-privacy-commits] [libotr] 206/225: Merge tag 'upstream/4.1.0_rc1'

[Ximin Luo]

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

infinity0 pushed a commit to branch master
in repository libotr.

commit 5374459d1969ee0fdb9373a019b19a62d3494a38
Merge: cb3c313 a171365
Author: intrigeri <intrigeri at boum.org>
Date:   Sat Oct 18 21:51:46 2014 +0000

    Merge tag 'upstream/4.1.0_rc1'
    
    Upstream version 4.1.0~rc1

 AUTHORS                             |    3 +-
 ChangeLog                           |  151 +
 INSTALL                             |    2 +-
 Makefile.am                         |    2 +
 Makefile.in                         |  100 +-
 NEWS                                |   14 +
 Protocol-v3.html                    |    6 +-
 README                              |   26 +-
 aclocal.m4                          | 8139 +----------------------------------
 config.guess                        |  397 +-
 config.sub                          |  220 +-
 config.guess => config/config.guess |  397 +-
 config.sub => config/config.sub     |  220 +-
 depcomp => config/depcomp           |   74 +-
 install-sh => config/install-sh     |    0
 aclocal.m4 => config/libtool.m4     | 3917 +++++++----------
 ltmain.sh => config/ltmain.sh       | 4016 +++++++++++------
 config/ltoptions.m4                 |  384 ++
 config/ltsugar.m4                   |  123 +
 config/ltversion.m4                 |   23 +
 config/lt~obsolete.m4               |   98 +
 missing => config/missing           |   53 +-
 configure                           | 3412 ++++++++++-----
 configure.ac                        |   33 +-
 depcomp                             |   74 +-
 libotr.pc.in                        |    2 +-
 ltmain.sh                           | 4016 +++++++++++------
 missing                             |   53 +-
 packaging/fedora/libotr.spec        |   95 +-
 src/Makefile.am                     |    2 +-
 src/Makefile.in                     |  102 +-
 src/auth.c                          |   20 +-
 src/context.c                       |    9 +-
 src/context.h                       |   14 +-
 src/dh.c                            |   11 +-
 src/mem.c                           |   20 +-
 src/mem.h                           |   13 +-
 src/message.c                       |   47 +-
 src/message.h                       |    7 +-
 src/proto.c                         |   40 +-
 src/sm.c                            |    9 +-
 src/version.h                       |    9 +-
 toolkit/Makefile.am                 |    2 +-
 toolkit/Makefile.in                 |  120 +-
 toolkit/otr_toolkit.1               |    4 +-
 toolkit/sesskeys.c                  |    8 +-
 46 files changed, 11161 insertions(+), 15326 deletions(-)

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