[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 03/04: Merge remote-tracking branch 'fengzh
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 03/04: Merge remote-tracking branch 'fengzhe/stream_to_tagged_stream_update' |
|
Date: |
Thu, 22 Jan 2015 23:02:00 +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 90c60a1589197988c02ef9bb7492b8c6d0a11cb3
Merge: cdf08db e6102cc
Author: Johnathan Corgan <address@hidden>
Date: Thu Jan 22 14:20:26 2015 -0800
Merge remote-tracking branch 'fengzhe/stream_to_tagged_stream_update'
gr-blocks/grc/blocks_stream_to_tagged_stream.xml | 2 ++
gr-blocks/include/gnuradio/blocks/stream_to_tagged_stream.h | 2 ++
gr-blocks/lib/stream_to_tagged_stream_impl.cc | 13 +++++++++++++
gr-blocks/lib/stream_to_tagged_stream_impl.h | 2 ++
4 files changed, 19 insertions(+)