[Commit-gnuradio] [gnuradio] 22/25: 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 49f4bfbd466a0750534f36677b564af310190081
Merge: 681846f 6efacb8
Author: Johnathan Corgan <address@hidden>
Date:   Fri May 27 11:20:42 2016 -0700

    Merge branch 'maint'

 gr-digital/include/gnuradio/digital/ofdm_equalizer_base.h      | 3 ++-
 gr-digital/include/gnuradio/digital/ofdm_equalizer_simpledfe.h | 3 ++-
 gr-digital/include/gnuradio/digital/ofdm_equalizer_static.h    | 3 ++-
 gr-utils/python/modtool/modtool_add.py                         | 5 ++---
 4 files changed, 8 insertions(+), 6 deletions(-)