[Commit-gnuradio] [gnuradio] 06/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 3490f126dad87e37a974615b8de0473e297ec0c9
Merge: 68c6862 7be615c
Author: Johnathan Corgan <address@hidden>
Date:   Sun Aug 30 13:40:23 2015 -0700

    Merge branch 'maint'

 gr-blocks/lib/file_meta_source_impl.cc                    | 2 +-
 gr-blocks/lib/tuntap_pdu_impl.cc                          | 2 +-
 gr-blocks/python/blocks/qa_multiply_matrix_ff.py          | 6 +++---
 gr-digital/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-trellis/lib/interleaver.cc                             | 2 ++
 7 files changed, 20 insertions(+), 6 deletions(-)