[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 0f879862915a6bd5f07f885391765b4b5f3a5547
Merge: 354c422 1ef31a4
Author: Johnathan Corgan <address@hidden>
Date:   Mon Mar 30 13:44:51 2015 -0700

    Merge branch 'master' into next

 CMakeLists.txt                      | 2 ++
 gnuradio-runtime/lib/CMakeLists.txt | 2 +-
 gr-analog/lib/CMakeLists.txt        | 2 +-
 gr-blocks/lib/CMakeLists.txt        | 2 +-
 gr-channels/lib/CMakeLists.txt      | 2 +-
 gr-digital/lib/CMakeLists.txt       | 2 +-
 gr-dtv/lib/CMakeLists.txt           | 2 +-
 gr-fec/lib/CMakeLists.txt           | 2 +-
 gr-filter/lib/CMakeLists.txt        | 2 +-
 gr-qtgui/lib/CMakeLists.txt         | 2 +-
 gr-wxgui/lib/CMakeLists.txt         | 2 +-
 11 files changed, 12 insertions(+), 10 deletions(-)