[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: |
Sat, 22 Feb 2014 22:27:33 +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 f89a7bb5ea635fdb320c4d485817a521d0eb8edb
Merge: a41a1e1 77c36d3
Author: Johnathan Corgan <address@hidden>
Date: Sat Feb 22 14:16:13 2014 -0800
Merge branch 'master' into next
gnuradio-runtime/lib/block_executor.cc | 4 +-
gr-blocks/grc/blocks_abs_xx.xml | 49 +++++++++++
gr-blocks/grc/blocks_block_tree.xml | 1 +
gr-blocks/include/gnuradio/blocks/CMakeLists.txt | 1 +
.../blocks/{tagged_stream_to_pdu.h => abs_XX.h.t} | 36 ++++----
.../include/gnuradio/blocks/tagged_stream_to_pdu.h | 12 +--
gr-blocks/lib/CMakeLists.txt | 1 +
.../lib/{regenerate_bb_impl.h => abs_XX_impl.cc.t} | 55 ++++++------
...tagged_stream_to_pdu_impl.h => abs_XX_impl.h.t} | 31 ++-----
gr-blocks/lib/message_strobe_random_impl.h | 6 +-
gr-blocks/lib/regenerate_bb_impl.h | 2 +-
gr-blocks/lib/tagged_stream_to_pdu_impl.cc | 99 +++++-----------------
gr-blocks/lib/tagged_stream_to_pdu_impl.h | 13 +--
gr-blocks/python/blocks/qa_pdu.py | 43 ++++++++--
gr-blocks/swig/blocks_swig2.i | 9 ++
15 files changed, 193 insertions(+), 169 deletions(-)