[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'master' into next
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'master' into next |
|
Date: |
Thu, 15 Jan 2015 20:47:29 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch next
in repository gnuradio.
commit 57cd598fdbe663f567529f0fa16c5e270f6d733a
Merge: 6828d04 bcd5230
Author: Johnathan Corgan <address@hidden>
Date: Thu Jan 15 12:44:44 2015 -0800
Merge branch 'master' into next
gnuradio-runtime/include/gnuradio/basic_block.h | 3 ++-
gnuradio-runtime/lib/basic_block.cc | 15 ++++++++++++---
gr-blocks/lib/pdu_to_tagged_stream_impl.cc | 5 ++++-
3 files changed, 18 insertions(+), 5 deletions(-)