[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 79e30247700d20751519f9763e338872efdda896
Merge: 4c8ac63 18a4dbf
Author: Johnathan Corgan <address@hidden>
Date:   Wed Mar 4 06:51:03 2015 -0800

    Merge branch 'master' into next

 gnuradio-runtime/include/pmt/pmt.h         | 25 +++++++++---
 gnuradio-runtime/lib/pmt/pmt.cc            | 62 ++++++++++++++++++++++--------
 gnuradio-runtime/python/pmt/__init__.py    |  3 ++
 gnuradio-runtime/swig/pmt_swig.i           | 12 +++---
 gr-analog/lib/CMakeLists.txt               |  2 +-
 gr-blocks/lib/pdu_to_tagged_stream_impl.cc |  4 +-
 gr-uhd/lib/CMakeLists.txt                  | 31 +++++++++++++++
 7 files changed, 109 insertions(+), 30 deletions(-)