[Commit-gnuradio] [gnuradio] 07/10: Merge branch 'maint'

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 9cbafd7fb523ff8107eb4e41751b3b062aabeddc
Merge: 64f3b70 3a2cf6e
Author: Johnathan Corgan <address@hidden>
Date:   Sun Feb 21 07:16:46 2016 -0800

    Merge branch 'maint'

 gr-blocks/lib/tagged_stream_align_impl.cc          |  1 +
 gr-fec/include/gnuradio/fec/polar_decoder_common.h |  6 ++++-
 gr-qtgui/lib/time_sink_c_impl.cc                   |  2 +-
 gr-qtgui/lib/time_sink_f_impl.cc                   |  2 +-
 gr-uhd/apps/uhd_rx_cfile                           | 27 +++++++++++-----------
 grc/gui/FlowGraph.py                               |  4 ++++
 6 files changed, 26 insertions(+), 16 deletions(-)