[Pkg-voip-commits] [sngrep] 04/04: Merge branch 'master' into jessie-backports

[Victor Seva Lopez]

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

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

commit fe515eb27031643be98eaa75decec9607df9a8b1
Merge: be0afdb 64fd802
Author: Victor Seva <linuxmaniac at torreviejawireless.org>
Date:   Mon Aug 31 12:21:32 2015 +0200

    Merge branch 'master' into jessie-backports

 .gitignore             |   1 +
 README.md              |  10 ++
 TODO                   |   6 -
 configure.ac           |   2 +-
 debian/changelog       |  11 +-
 debian/watch           |   2 +-
 doc/sngrep.8           |   2 +-
 src/capture.c          | 261 ++++++++++++++++++++--------------------
 src/capture.h          |  35 ++++--
 src/capture_tls.c      |  44 ++++---
 src/capture_tls.h      |   2 +-
 src/capture_ws.c       |  67 +++++++----
 src/capture_ws.h       |   2 +-
 src/filter.c           |   6 +-
 src/group.c            |  12 +-
 src/keybinding.c       |  39 ++++--
 src/keybinding.h       |   6 +-
 src/main.c             |   4 +-
 src/media.c            |  56 +++++++--
 src/media.h            |  33 +++--
 src/option.c           |   7 +-
 src/rtp.c              | 188 +++++++++++++++++------------
 src/rtp.h              |  41 ++++---
 src/setting.c          |  74 ++++++------
 src/setting.h          |   6 +-
 src/sip.c              |  47 ++++----
 src/sip.h              |   4 +-
 src/sip_attr.c         |  13 +-
 src/sip_attr.h         |   5 +-
 src/sip_call.c         |  14 ++-
 src/sip_msg.c          |  21 ++--
 src/sip_msg.h          |   2 +
 src/ui_call_flow.c     | 203 ++++++++++++++++---------------
 src/ui_call_flow.h     |  34 +++---
 src/ui_call_list.c     |   5 +-
 src/ui_call_raw.c      |   5 +-
 src/ui_column_select.c |   5 +-
 src/ui_filter.c        |   7 +-
 src/ui_manager.c       |   5 +-
 src/ui_msg_diff.c      |   6 +-
 src/ui_save.c          |   5 +-
 src/ui_settings.c      | 320 ++++++++++++++++++++++++-------------------------
 src/ui_settings.h      |   6 +-
 src/util.c             |  25 ++++
 src/util.h             |  16 +++
 src/vector.c           |  17 ++-
 src/vector.h           |   6 +-
 tests/Makefile.am      |   4 +-
 tests/test_007.c       |  35 +++---
 49 files changed, 971 insertions(+), 756 deletions(-)

diff --cc debian/changelog
index 4b96ab4,46d42f1..7e6a13f
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,9 +1,15 @@@
- sngrep (0.4.1-1~bpo8+1) jessie-backports; urgency=medium
++sngrep (0.4.2-1~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
-  -- Victor Seva <linuxmaniac at torreviejawireless.org>  Wed, 15 Jul 2015 09:30:52 +0200
++ -- Victor Seva <linuxmaniac at torreviejawireless.org>  Mon, 31 Aug 2015 12:20:54 +0200
++
+ sngrep (0.4.2-1) unstable; urgency=medium
+ 
+   * [10e3aaa] fix watch file
+   * [34a4162] Imported Upstream version 0.4.2
+ 
+  -- Victor Seva <linuxmaniac at torreviejawireless.org>  Mon, 31 Aug 2015 12:17:56 +0200
  
  sngrep (0.4.1-1) unstable; urgency=medium
  

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