[Commit-gnuradio] [gnuradio] 01/01: 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 8f6de3a5e82618a2e2bbdf9aeb9e7197be86830e
Merge: 52a4e1f 20530e6
Author: Johnathan Corgan <address@hidden>
Date:   Thu Jul 24 12:43:02 2014 -0700

    Merge branch 'master' into next

 cmake/Modules/GrMiscUtils.cmake                    | 174 ++++++++++++++++++++-
 gr-analog/include/gnuradio/analog/CMakeLists.txt   |  55 +------
 gr-analog/lib/CMakeLists.txt                       |  72 +--------
 gr-blocks/include/gnuradio/blocks/CMakeLists.txt   | 109 ++++---------
 gr-blocks/lib/CMakeLists.txt                       | 126 ++++-----------
 gr-digital/include/gnuradio/digital/CMakeLists.txt |  51 +-----
 gr-digital/lib/CMakeLists.txt                      |  67 +-------
 gr-fec/include/gnuradio/fec/CMakeLists.txt         |  54 -------
 gr-filter/include/gnuradio/filter/CMakeLists.txt   |  57 +------
 gr-filter/lib/CMakeLists.txt                       |  74 +--------
 gr-trellis/include/gnuradio/trellis/CMakeLists.txt |  69 ++------
 gr-trellis/lib/CMakeLists.txt                      |  85 ++--------
 12 files changed, 296 insertions(+), 697 deletions(-)