[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'maint'
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'maint' |
|
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 master
in repository gnuradio.
commit bcd5230e7bfea6553ab091a0b14f098fb749b436
Merge: dfacb55 838793c
Author: Johnathan Corgan <address@hidden>
Date: Thu Jan 15 12:20:49 2015 -0800
Merge branch 'maint'
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(-)