[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, 22 Jan 2015 23:02:01 +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 5dfeb2ef0434515cec1e4e7308206b0335e61c74
Merge: 01e74ae 32d701e
Author: Johnathan Corgan <address@hidden>
Date: Thu Jan 22 14:53:50 2015 -0800
Merge branch 'master' into next
gr-blocks/grc/blocks_stream_to_tagged_stream.xml | 2 ++
.../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 ++
gr-utils/python/modtool/modtool_add.py | 17 +++++++++++++----
5 files changed, 32 insertions(+), 4 deletions(-)