[Commit-gnuradio] [gnuradio] branch master updated (15f1c7f -> d5fc1c6)

[git]

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

jcorgan pushed a change to branch master
in repository gnuradio.

  discards  15f1c7f   Merge branch 'maint'
  discards  226b6a7   Merge remote-tracking branch 'osh/add_const_type_issue' 
into maint
  discards  155f225   blocks: resolve char sign ambiguity causing build 
breakage with several gcc versions

This update removed existing revisions from the reference, leaving the
reference pointing at a previous point in the repository history.

 * -- * -- N   refs/heads/master (d5fc1c6)
            \
             O -- O -- O   (15f1c7f)

Any revisions marked "omits" are not gone; other references still
refer to them.  Any revisions marked "discards" are gone forever.

No new revisions were added by this update.

Summary of changes:
 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 ++++----
 3 files changed, 15 insertions(+), 15 deletions(-)