[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, 4 Apr 2015 17:39:31 +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 0e4f02cfee57c73712a8bb21b408d69d9fcfe1b9
Merge: 83ded12 e16f948
Author: Johnathan Corgan <address@hidden>
Date: Sat Apr 4 10:14:00 2015 -0700
Merge branch 'master' into next
gnuradio-runtime/include/gnuradio/basic_block.h | 1 -
gnuradio-runtime/lib/top_block_impl.cc | 23 +++++++++++--
gnuradio-runtime/lib/top_block_impl.h | 2 ++
gnuradio-runtime/python/gnuradio/gr/top_block.py | 8 ++++-
gnuradio-runtime/swig/top_block.i | 8 +++++
gr-blocks/grc/blocks_repack_bits_bb.xml | 3 +-
gr-blocks/lib/pdu_to_tagged_stream_impl.cc | 18 +++++-----
gr-blocks/lib/repack_bits_bb_impl.cc | 6 ++--
gr-blocks/lib/tagged_stream_mux_impl.cc | 25 +++++++-------
gr-blocks/python/blocks/qa_hier_block2.py | 16 +++++++++
gr-digital/examples/ofdm/tunnel.py | 11 ++++---
.../gnuradio/digital/correlate_and_sync_cc.h | 11 +++----
.../gnuradio/digital/packet_header_default.h | 38 ++++++++++------------
gr-qtgui/python/qtgui/range.py | 8 +++--
14 files changed, 114 insertions(+), 64 deletions(-)