[Commit-gnuradio] [gnuradio] 13/16: Merge remote-tracking branch 'mmueller/pwr_squelch_add_tags'

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 34d490cc200ed078d7a5366f72d5e7f5664f7eef
Merge: c754032 93a35f0
Author: Johnathan Corgan <address@hidden>
Date:   Sun Apr 26 15:50:21 2015 -0700

    Merge remote-tracking branch 'mmueller/pwr_squelch_add_tags'

 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 +
 7 files changed, 139 insertions(+), 94 deletions(-)