|
| From: | git |
| Subject: | [Commit-gnuradio] [gnuradio] 08/09: Merge remote-tracking branch 'nwest/block-log_set_level' into next |
| Date: | Sat, 6 Aug 2016 22:28:36 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch next
in repository gnuradio.
commit 4b0fbb40e788500fe002e027594ddf12a1176c26
Merge: f82585c af95d3c
Author: Johnathan Corgan <address@hidden>
Date: Sat Aug 6 15:09:42 2016 -0700
Merge remote-tracking branch 'nwest/block-log_set_level' into next
gnuradio-runtime/include/gnuradio/basic_block.h | 6 ++
gnuradio-runtime/include/gnuradio/block.h | 24 +++++++
gnuradio-runtime/include/gnuradio/hier_block2.h | 25 +++++++
gnuradio-runtime/lib/block.cc | 14 ++++
gnuradio-runtime/lib/hier_block2.cc | 12 ++++
gnuradio-runtime/lib/hier_block2_detail.cc | 18 +++++
gnuradio-runtime/lib/hier_block2_detail.h | 3 +
gnuradio-runtime/swig/block.i | 3 +
gnuradio-runtime/swig/hier_block2.i | 3 +
gr-blocks/python/blocks/qa_logger.py | 96 +++++++++++++++++++++++++
10 files changed, 204 insertions(+)
| [Prev in Thread] | Current Thread | [Next in Thread] |