[Pkg-voip-commits] [resiprocate] 01/03: Merge tag 'upstream/1.9.6'

[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 03d24fcdad940b1406965a8c78cd91b9a4311b07
Merge: 24fff4a 70bfa3e
Author: Daniel Pocock <daniel at pocock.pro>
Date:   Thu Apr 10 10:03:33 2014 +0200

    Merge tag 'upstream/1.9.6'
    
    Upstream version 1.9.6

 configure                             | 20 ++++++++++----------
 configure.ac                          |  2 +-
 repro/Makefile.am                     |  1 +
 repro/Makefile.in                     |  2 +-
 repro/RequestContext.cxx              | 14 +++-----------
 repro/ResponseContext.cxx             |  4 +---
 repro/reprocmd/Makefile.am            |  1 -
 repro/reprocmd/Makefile.in            |  2 +-
 resip/recon/ConversationManager.cxx   |  7 +++++--
 resip/recon/MOHParkServer/Makefile.am |  1 +
 resip/recon/MOHParkServer/Makefile.in |  2 +-
 resip/recon/Makefile.am               |  3 +++
 resip/recon/Makefile.in               |  4 ++--
 resip/recon/test/Makefile.am          |  2 ++
 resip/recon/test/Makefile.in          |  5 +++--
 resiprocate.spec                      |  4 ++--
 16 files changed, 37 insertions(+), 37 deletions(-)

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