[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 ab6459e5a99a6add778238bdeb8f569e48c52596
Merge: 4231129 a064206
Author: Johnathan Corgan <address@hidden>
Date:   Sun Aug 30 14:01:33 2015 -0700

    Merge branch 'master' into next
    
    Conflicts:
        gr-atsc/lib/atsci_fake_single_viterbi.cc

 gr-blocks/lib/file_meta_source_impl.cc             |   2 +-
 gr-blocks/lib/tuntap_pdu_impl.cc                   |   2 +-
 gr-blocks/lib/vector_insert_X_impl.cc.t            |   8 +
 gr-blocks/python/blocks/qa_multiply_matrix_ff.py   |   6 +-
 gr-blocks/python/blocks/qa_vector_insert.py        |  61 ++++++
 .../include/gnuradio/digital/lms_dd_equalizer_cc.h |   2 +-
 gr-digital/lib/lms_dd_equalizer_cc_impl.cc         |   6 +
 gr-digital/lib/ofdm_equalizer_simpledfe.cc         |   6 +
 gr-digital/python/digital/ofdm_txrx.py             |   2 +-
 gr-qtgui/CMakeLists.txt                            |   1 +
 gr-qtgui/themes/projector.qss                      | 223 +++++++++++++++++++++
 gr-trellis/lib/interleaver.cc                      |   2 +
 12 files changed, 314 insertions(+), 7 deletions(-)