[Pkg-voip-commits] [resiprocate] 01/04: Merge tag 'upstream/1.9.4'

[Daniel Pocock]

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

pocock pushed a commit to branch master
in repository resiprocate.

commit 01c68fbad3430b2fb4deb4c924d8cb2f9f3dd848
Merge: 95c7d06 cd8ec8c
Author: Daniel Pocock <daniel at pocock.pro>
Date:   Tue Mar 25 21:32:14 2014 +0100

    Merge tag 'upstream/1.9.4'
    
    Upstream version 1.9.4

 ChangeLog                                |  6 ++++
 configure                                | 20 +++++++-------
 configure.ac                             |  2 +-
 reflow/Makefile.am                       |  1 +
 reflow/Makefile.in                       |  4 +--
 resip/recon/Conversation.hxx             | 10 +++++++
 resip/recon/ConversationManager.hxx      | 15 ++++++++--
 resip/recon/MOHParkServer/Makefile.am    |  5 ----
 resip/recon/MOHParkServer/Makefile.in    |  3 +-
 resip/recon/Makefile.am                  |  1 +
 resip/recon/Makefile.in                  |  5 ++--
 resip/recon/MediaInterface.cxx           | 11 +++++++-
 resip/recon/MediaResourceParticipant.cxx | 47 ++++++++++++++++++++++++++++++--
 resip/recon/RemoteParticipant.cxx        |  2 +-
 resip/recon/test/Makefile.am             |  6 ----
 resip/recon/test/Makefile.in             |  4 +--
 resiprocate.spec                         |  4 +--
 17 files changed, 107 insertions(+), 39 deletions(-)

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