[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: |
Sun, 23 Feb 2014 22:19:54 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
trondeau pushed a commit to branch next
in repository gnuradio.
commit 3adf49c5712c42a401c0676bbf1ab8c2861736f0
Merge: f89a7bb 97b12c2
Author: Tom Rondeau <address@hidden>
Date: Sun Feb 23 17:19:02 2014 -0500
Merge branch 'master' into next
cmake/Modules/FindICE.cmake | 4 +-
docs/doxygen/other/stream_tags.dox | 27 ++++++---
gnuradio-runtime/include/gnuradio/block.h | 50 +++++++++++++++-
gnuradio-runtime/lib/block.cc | 51 ++++++++++++-----
.../python/gnuradio/gr/qa_tag_utils.py | 30 ++++++++++
gnuradio-runtime/python/gnuradio/gr/tag_utils.py | 66 ++++++++++++++++++++++
.../gnuradio/blocks/message_strobe_random.h | 19 ++++---
.../include/gnuradio/blocks/tagged_stream_to_pdu.h | 11 ++--
.../include/gnuradio/blocks/vector_source_X.h.t | 30 +++++++++-
gr-qtgui/lib/freq_sink_c_impl.cc | 20 +++----
gr-qtgui/lib/freq_sink_f_impl.cc | 18 +++---
11 files changed, 268 insertions(+), 58 deletions(-)