[Commit-gnuradio] [gnuradio] 02/02: Merge remote-tracking branch 'osh/add_const_type_issue' into maint

[git]

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

jcorgan pushed a commit to branch maint
in repository gnuradio.

commit 226b6a770d59af7afd084d240dd5cd4da7aae010
Merge: 6dfb538 155f225
Author: Johnathan Corgan <address@hidden>
Date:   Mon Dec 28 08:24:07 2015 -0800

    Merge remote-tracking branch 'osh/add_const_type_issue' into maint

 CMakeLists.txt                                   |  4 ++--
 gr-blocks/include/gnuradio/blocks/add_const_bb.h |  6 +++---
 gr-blocks/lib/add_const_bb_impl.cc               | 16 ++++++++--------
 gr-blocks/lib/add_const_bb_impl.h                |  8 ++++----
 4 files changed, 17 insertions(+), 17 deletions(-)