[Pkg-voip-commits] [sngrep] 01/01: Merge branch 'master' into wheezy-backports
Victor Seva Lopez
maniac-guest at moszumanska.debian.org
Mon Aug 31 10:31:35 UTC 2015
This is an automated email from the git hooks/post-receive script.
maniac-guest pushed a commit to branch wheezy-backports
in repository sngrep.
commit 77d6ff5c187952f98202474688706f2d1f2c31ef
Merge: 8569dd4 64fd802
Author: Victor Seva <linuxmaniac at torreviejawireless.org>
Date: Mon Aug 31 12:26:16 2015 +0200
Merge branch 'master' into wheezy-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 7cb9650,46d42f1..ed0d0c2
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,9 +1,15 @@@
- sngrep (0.4.1-1~bpo7+1) wheezy-backports; urgency=medium
++sngrep (0.4.2-1~bpo7+1) wheezy-backports; urgency=medium
+
+ * Rebuild for wheezy-backports.
+
- -- Victor Seva <linuxmaniac at torreviejawireless.org> Wed, 15 Jul 2015 09:25:39 +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
More information about the Pkg-voip-commits
mailing list