[Commit-gnuradio] [gnuradio] 06/08: Merge remote-tracking branch 'osh/tsb_align'

[git]

This is an automated email from the git hooks/post-receive script.

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 04e34d6f8745e0d2a257724a37e3115753afca52
Merge: 86353a4 3cd98be
Author: Johnathan Corgan <address@hidden>
Date:   Wed Apr 1 05:38:01 2015 -0700

    Merge remote-tracking branch 'osh/tsb_align'
    
    Conflicts:
        volk

 gr-blocks/grc/blocks_block_tree.xml                |  1 +
 gr-blocks/grc/blocks_tagged_stream_align.xml       | 59 +++++++++++++++
 gr-blocks/include/gnuradio/blocks/CMakeLists.txt   |  1 +
 .../include/gnuradio/blocks/tagged_stream_align.h  | 55 ++++++++++++++
 gr-blocks/lib/CMakeLists.txt                       |  1 +
 gr-blocks/lib/tagged_stream_align_impl.cc          | 86 ++++++++++++++++++++++
 gr-blocks/lib/tagged_stream_align_impl.h           | 53 +++++++++++++
 gr-blocks/swig/blocks_swig5.i                      |  3 +
 8 files changed, 259 insertions(+)