[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] branch next updated (83ded12 -> 0e4f02c)
From: |
git |
Subject: |
[Commit-gnuradio] [gnuradio] branch next updated (83ded12 -> 0e4f02c) |
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 change to branch next
in repository gnuradio.
from 83ded12 Merge branch 'master' into next
new 2aded1a runtime: fix wait() race condition
new 43065a6 runtime: QA for lock()/unlock() deadlock
new 7b7c336 runtime: fix deadlock in unlock() from Python #594
new 0dffcb7 Merge remote-tracking branch 'pinkavaj/lock-fix-03' into
maint
new fa02d57 fix gr-digital/examples/ofdm/tunnel.py error: option
mismatch
new 4149239 Merge branch 'maint'
new 4db9371 runtime: cleanup: Removing leftovers.
new a3080e6 Merge remote-tracking branch 'mfischer/micro_cleanup'
new 5a0322b qtgui: cherry-pick the range slide starting point bug fix
new 5392a4a qtqui: fixed notches on knob
new ed242b2 Merge remote-tracking branch 'tkoehn/additional_fix'
new 432b76e blocks: misc. formatting cleanups
new e16f948 Merge remote-tracking branch 'github/blocks_cleanup'
new 0e4f02c Merge branch 'master' into next
The 14 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.
Summary of changes:
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(-)
- [Commit-gnuradio] [gnuradio] branch next updated (83ded12 -> 0e4f02c),
git <=