[Pkg-voip-commits] [sngrep] 01/03: Merge tag 'upstream/1.2.0'

[Victor Seva Lopez]

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

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

commit 5dca5172941ea8481617814f7d691564f3907bd4
Merge: c0bd6c2 0d50885
Author: Victor Seva <linuxmaniac at torreviejawireless.org>
Date:   Tue Jan 12 22:44:42 2016 +0100

    Merge tag 'upstream/1.2.0'
    
    Upstream version 1.2.0

 README.md           |   1 +
 configure.ac        |   2 +-
 doc/sngrep.8        |   2 +-
 src/Makefile.am     |   2 +-
 src/capture.c       | 354 +++++++++++++++++++++++++++++++++++++++++++++++++---
 src/capture.h       |  73 +++++++++++
 src/capture_eep.c   | 268 +++++++++++++++++++++++++++++++++++----
 src/capture_eep.h   |  55 +++++++-
 src/capture_reasm.c | 256 -------------------------------------
 src/capture_reasm.h |  99 ---------------
 src/capture_ws.c    | 134 --------------------
 src/capture_ws.h    |  52 --------
 src/keybinding.c    |  20 +++
 src/keybinding.h    |  10 ++
 src/rtp.c           |   2 +
 src/setting.c       |  12 +-
 src/setting.h       |   8 ++
 src/ui_call_flow.c  | 171 +++++++++++++++----------
 src/ui_call_list.c  |  39 +++++-
 src/ui_call_list.h  |   2 +
 src/ui_manager.c    |   2 +
 src/ui_manager.h    |   2 +
 src/ui_settings.c   |   2 +
 src/ui_settings.h   |   4 +
 24 files changed, 908 insertions(+), 664 deletions(-)

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