[Commit-gnuradio] [gnuradio] 07/08: Merge remote-tracking branch 'osh/flat_fader_testing_next' into next

[git]

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

jcorgan pushed a commit to branch next
in repository gnuradio.

commit fcbbcc8c7c065b36347764e0a32a6c18a5cfc962
Merge: 06a7c93 c57119d
Author: Johnathan Corgan <address@hidden>
Date:   Fri Jun 10 13:28:43 2016 -0700

    Merge remote-tracking branch 'osh/flat_fader_testing_next' into next

 gr-channels/grc/channels_block_tree.xml            |   1 +
 .../grc/channels_selective_fading_model2.xml       | 128 +++++++++++++++++++++
 .../include/gnuradio/channels/CMakeLists.txt       |   1 +
 .../gnuradio/channels/selective_fading_model2.h    |  90 +++++++++++++++
 gr-channels/lib/CMakeLists.txt                     |   1 +
 gr-channels/lib/fading_model_impl.cc               |   5 +-
 gr-channels/lib/flat_fader_impl.cc                 |  71 ++++++------
 gr-channels/lib/flat_fader_impl.h                  |   3 +-
 ...del_impl.cc => selective_fading_model2_impl.cc} |  81 +++++++++----
 gr-channels/lib/selective_fading_model2_impl.h     |  87 ++++++++++++++
 gr-channels/lib/selective_fading_model_impl.cc     |  10 +-
 gr-channels/swig/channels_swig.i                   |   3 +
 12 files changed, 419 insertions(+), 62 deletions(-)