[Commit-gnuradio] [gnuradio] 06/07: 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 2b8e6a610663e69d4049871adc847371a7e7fccb
Merge: 559845d 0341203
Author: Johnathan Corgan <address@hidden>
Date:   Wed Mar 30 22:38:25 2016 -0700

    Merge branch 'maint'

 gr-blocks/include/gnuradio/blocks/head.h                          | 2 +-
 gr-blocks/lib/head_impl.h                                         | 2 +-
 gr-digital/lib/correlate_access_code_bb_ts_impl.cc                | 4 ++--
 gr-digital/lib/correlate_access_code_ff_ts_impl.cc                | 4 ++--
 gr-utils/python/modtool/gr-newmod/CMakeLists.txt                  | 1 +
 gr-utils/python/modtool/gr-newmod/cmake/Modules/GrMiscUtils.cmake | 3 +++
 6 files changed, 10 insertions(+), 6 deletions(-)