[Commit-gnuradio] [gnuradio] 08/08: Merge branch 'master' 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 0dc807264759c24b3fa1cb53da637185575f391d
Merge: fcbbcc8 d7eaf6e
Author: Johnathan Corgan <address@hidden>
Date:   Fri Jun 10 13:29:08 2016 -0700

    Merge branch 'master' into next

 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 +++++++++++++++++++++++++++++
 6 files changed, 246 insertions(+), 1 deletion(-)