[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'master' into next
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'master' into next |
|
Date: |
Sun, 26 Apr 2015 23:18:04 +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 5d6e87870328ce45eab28805e456324f14b8bfed
Merge: c5e6d08 327f070
Author: Johnathan Corgan <address@hidden>
Date: Sun Apr 26 16:13:41 2015 -0700
Merge branch 'master' into next
.../python/gnuradio/ctrlport/gr-perf-monitorx | 143 +--
.../python/gnuradio/gr/qa_tag_utils.py | 32 +
gnuradio-runtime/python/gnuradio/gr/tag_utils.py | 33 +
gr-analog/grc/analog_pwr_squelch_xx.xml | 2 +
gr-analog/include/gnuradio/analog/pwr_squelch_cc.h | 10 +-
gr-analog/include/gnuradio/analog/pwr_squelch_ff.h | 10 +-
gr-analog/lib/squelch_base_cc_impl.cc | 101 +-
gr-analog/lib/squelch_base_cc_impl.h | 2 +
gr-analog/lib/squelch_base_ff_impl.cc | 105 +-
gr-analog/lib/squelch_base_ff_impl.h | 3 +
gr-blocks/examples/CMakeLists.txt | 1 +
gr-blocks/examples/peak_detector2.grc | 1045 ++++++++++++++++++++
gr-blocks/grc/blocks_peak_detector2_fb.xml | 5 +
gr-blocks/lib/ctrlport_probe2_b_impl.cc | 30 +-
gr-blocks/lib/ctrlport_probe2_b_impl.h | 2 +-
gr-blocks/lib/ctrlport_probe2_c_impl.cc | 30 +-
gr-blocks/lib/ctrlport_probe2_c_impl.h | 1 +
gr-blocks/lib/ctrlport_probe2_f_impl.cc | 31 +-
gr-blocks/lib/ctrlport_probe2_f_impl.h | 1 +
gr-blocks/lib/ctrlport_probe2_i_impl.cc | 31 +-
gr-blocks/lib/ctrlport_probe2_i_impl.h | 1 +
gr-blocks/lib/ctrlport_probe2_s_impl.cc | 27 +-
gr-blocks/lib/ctrlport_probe2_s_impl.h | 1 +
gr-blocks/lib/peak_detector2_fb_impl.cc | 103 +-
gr-blocks/lib/peak_detector2_fb_impl.h | 10 +-
gr-blocks/python/blocks/qa_peak_detector2.py | 87 +-
.../include/gnuradio/digital/burst_shaper_XX.h.t | 10 +-
gr-digital/lib/burst_shaper_XX_impl.cc.t | 88 +-
gr-digital/lib/burst_shaper_XX_impl.h.t | 4 +-
gr-digital/python/digital/qa_burst_shaper.py | 102 +-
gr-qtgui/grc/qtgui_range.xml | 209 ++--
gr-qtgui/python/qtgui/range.py | 67 +-
grc/scripts/gnuradio-companion | 9 +
33 files changed, 1910 insertions(+), 426 deletions(-)