[Pkg-voip-commits] [twinkle] 01/06: Merge tag 'upstream/1.9.0+git20160520.0.be8b8df+dfsg'

[Peter Colberg]

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

pc-guest pushed a commit to branch master
in repository twinkle.

commit fffa741a5fb259e6c37df0262a26d2b1ad12ef9c
Merge: 64631c7 ef9654f
Author: Peter Colberg <peter at colberg.org>
Date:   Sun Jun 26 18:15:34 2016 -0400

    Merge tag 'upstream/1.9.0+git20160520.0.be8b8df+dfsg'
    
    Upstream version 1.9.0+git20160520.0.be8b8df+dfsg

 src/audio/audio_rx.cpp            |  2 +-
 src/audio/audio_rx.h              |  4 ++--
 src/audio/dtmf_player.cpp         |  6 +++---
 src/audio/dtmf_player.h           |  8 ++++----
 src/audio/freq_gen.cpp            |  3 ++-
 src/audio/freq_gen.h              |  4 +++-
 src/audio/rtp_telephone_event.cpp |  8 ++++++--
 src/audio/rtp_telephone_event.h   | 25 ++++++++++++++++++++-----
 src/dialog.cpp                    |  2 +-
 src/events.cpp                    |  2 +-
 src/events.h                      |  5 +++--
 src/gui/gui.cpp                   | 10 +++++-----
 src/gui/gui.h                     |  4 ++--
 src/parser/sip_body.cpp           |  2 +-
 src/userintf.cpp                  | 16 ++++++++--------
 src/userintf.h                    |  8 ++++----
 16 files changed, 66 insertions(+), 43 deletions(-)

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