[Commit-gnuradio] [gnuradio] 12/16: Merge remote-tracking branch 'jynik/ctcss_squelch_add_freq_getset'

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit df6d6674d7206ca96cdc54d05d5b721d5a87cca1
Merge: 28ba7e4 816eb84
Author: Johnathan Corgan <address@hidden>
Date:   Sat Mar 28 18:43:03 2015 -0700

    Merge remote-tracking branch 'jynik/ctcss_squelch_add_freq_getset'

 gr-analog/grc/analog_ctcss_squelch_ff.xml          |  1 +
 .../include/gnuradio/analog/ctcss_squelch_ff.h     |  2 +
 gr-analog/lib/ctcss_squelch_ff_impl.cc             | 70 ++++++++++++++++------
 gr-analog/lib/ctcss_squelch_ff_impl.h              | 10 +++-
 gr-analog/lib/pwr_squelch_cc_impl.cc               | 14 +++++
 gr-analog/lib/pwr_squelch_cc_impl.h                |  4 +-
 gr-analog/lib/squelch_base_cc_impl.cc              |  4 ++
 7 files changed, 83 insertions(+), 22 deletions(-)