[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'next' into next-qt5

[git]

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

jcorgan pushed a commit to branch next-qt5
in repository gnuradio.

commit a0ecf33c0aee46c1c28874432bc7c81f623f169a
Merge: 87736f4 0dc8072
Author: Johnathan Corgan <address@hidden>
Date:   Fri Jun 10 13:42:31 2016 -0700

    Merge branch 'next' into next-qt5

 CMakeLists.txt                                     |  17 +++
 gr-blocks/lib/CMakeLists.txt                       |   4 +-
 gr-blocks/lib/divide_cc_impl.cc                    |  66 +++++++++++
 gr-blocks/lib/divide_cc_impl.h                     |  47 ++++++++
 gr-blocks/lib/divide_ff_impl.cc                    |  66 +++++++++++
 gr-blocks/lib/divide_ff_impl.h                     |  47 ++++++++
 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 +
 18 files changed, 665 insertions(+), 63 deletions(-)