[Pkg-voip-commits] [sngrep] 02/04: Merge tag 'upstream/1.1.0'

[Victor Seva Lopez]

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

maniac-guest pushed a commit to branch pre_1.1.0
in repository sngrep.

commit 7788a5dbcd2107a549ff192b26d8486055736817
Merge: 1c5cd04 53e1c8d
Author: Victor Seva <linuxmaniac at torreviejawireless.org>
Date:   Tue Oct 27 22:21:24 2015 +0100

    Merge tag 'upstream/1.1.0'
    
    Upstream version 1.1.0

 README.md                                |  34 ++--
 config/sngreprc                          |   2 +-
 configure.ac                             |  55 +++++-
 doc/sngrep.8                             |   2 +-
 src/Makefile.am                          |  12 +-
 src/capture.c                            |  11 +-
 src/capture.h                            |   1 +
 src/{capture_tls.c => capture_gnutls.c}  | 125 +++++++-----
 src/{capture_tls.h => capture_gnutls.h}  |  43 ++---
 src/{capture_tls.c => capture_openssl.c} |   2 +-
 src/{capture_tls.h => capture_openssl.h} |   0
 src/capture_reasm.c                      |  10 +-
 src/filter.c                             |  54 ++++--
 src/filter.h                             |  10 +
 src/keybinding.c                         | 242 +++++++++---------------
 src/keybinding.h                         |  17 +-
 src/main.c                               |  35 +++-
 src/option.c                             |   3 -
 src/rtp.c                                | 187 +++++++++++++-----
 src/rtp.h                                | 218 ++++++++++++++++++++-
 src/sip.c                                |  38 +++-
 src/sip.h                                |   6 +
 src/ui_call_flow.c                       | 313 ++++++++++++++++++++++++++++---
 src/ui_call_flow.h                       |  28 ++-
 src/ui_call_list.c                       |  10 +-
 src/ui_filter.c                          |  53 +++---
 src/ui_filter.h                          |   1 +
 src/ui_manager.c                         |   3 +-
 src/ui_manager.h                         |   3 +
 src/ui_settings.c                        |   6 +-
 src/ui_stats.c                           | 222 ++++++++++++++++++++++
 src/ui_stats.h                           |  71 +++++++
 src/vector.c                             |   6 +
 src/vector.h                             |   6 +
 34 files changed, 1427 insertions(+), 402 deletions(-)

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