[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 58486e918fc4c67cd4bb29c0e30a23b8425afd0e
Merge: 33df8cb d8a491f
Author: Johnathan Corgan <address@hidden>
Date:   Tue Apr 21 20:04:32 2015 -0700

    Merge branch 'master' into next

 gnuradio-runtime/lib/pmt/unv_template.cc.t         |   3 +-
 gr-blocks/lib/message_strobe_impl.cc               |   3 +
 gr-digital/examples/CMakeLists.txt                 |   7 +
 gr-digital/examples/burst_shaper.grc               | 880 +++++++++++++++++++++
 gr-digital/grc/digital_burst_shaper.xml            |  71 ++
 gr-digital/include/gnuradio/digital/CMakeLists.txt |   1 +
 .../include/gnuradio/digital/burst_shaper_XX.h.t   | 115 +++
 gr-digital/lib/CMakeLists.txt                      |   1 +
 gr-digital/lib/burst_shaper_XX_impl.cc.t           | 329 ++++++++
 gr-digital/lib/burst_shaper_XX_impl.h.t            |  90 +++
 gr-digital/python/digital/qa_burst_shaper.py       | 274 +++++++
 gr-digital/swig/digital_swig.i                     |   6 +
 12 files changed, 1778 insertions(+), 2 deletions(-)